Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Side by Side Diff: Source/core/dom/custom/CustomElementMicrotaskImportStep.cpp

Issue 299313013: Remove indirection plumbing from HTMLImportChild. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/html/imports/HTMLImportChild.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 56 }
57 57
58 void CustomElementMicrotaskImportStep::parentWasChanged() 58 void CustomElementMicrotaskImportStep::parentWasChanged()
59 { 59 {
60 m_queue = CustomElementMicrotaskQueue::create(); 60 m_queue = CustomElementMicrotaskQueue::create();
61 m_import.clear(); 61 m_import.clear();
62 } 62 }
63 63
64 bool CustomElementMicrotaskImportStep::shouldWaitForImport() const 64 bool CustomElementMicrotaskImportStep::shouldWaitForImport() const
65 { 65 {
66 return m_import && !m_import->isLoaded(); 66 return m_import && !m_import->loader()->isDone();
67 } 67 }
68 68
69 void CustomElementMicrotaskImportStep::didUpgradeAllCustomElements() 69 void CustomElementMicrotaskImportStep::didUpgradeAllCustomElements()
70 { 70 {
71 ASSERT(m_queue); 71 ASSERT(m_queue);
72 if (m_import) 72 if (m_import)
73 m_import->didFinishUpgradingCustomElements(); 73 m_import->didFinishUpgradingCustomElements();
74 } 74 }
75 75
76 CustomElementMicrotaskStep::Result CustomElementMicrotaskImportStep::process() 76 CustomElementMicrotaskStep::Result CustomElementMicrotaskImportStep::process()
(...skipping 14 matching lines...) Expand all
91 91
92 #if !defined(NDEBUG) 92 #if !defined(NDEBUG)
93 void CustomElementMicrotaskImportStep::show(unsigned indent) 93 void CustomElementMicrotaskImportStep::show(unsigned indent)
94 { 94 {
95 fprintf(stderr, "%*sImport(wait=%d sync=%d, url=%s)\n", indent, "", shouldWa itForImport(), m_import && m_import->isSync(), m_import ? m_import->url().string ().utf8().data() : "null"); 95 fprintf(stderr, "%*sImport(wait=%d sync=%d, url=%s)\n", indent, "", shouldWa itForImport(), m_import && m_import->isSync(), m_import ? m_import->url().string ().utf8().data() : "null");
96 m_queue->show(indent + 1); 96 m_queue->show(indent + 1);
97 } 97 }
98 #endif 98 #endif
99 99
100 } // namespace WebCore 100 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/imports/HTMLImportChild.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698