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

Unified Diff: Source/core/html/imports/HTMLImportStateResolver.cpp

Issue 299313013: Remove indirection plumbing from HTMLImportChild. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/imports/HTMLImportChild.cpp ('k') | Source/core/html/imports/HTMLImportsController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/HTMLImportStateResolver.cpp
diff --git a/Source/core/html/imports/HTMLImportStateResolver.cpp b/Source/core/html/imports/HTMLImportStateResolver.cpp
index df03643504e0a68fd7e00a2fe6c8146dd02f41de..9a1f2bfa534863ea03e83cd83630d58fd4910d75 100644
--- a/Source/core/html/imports/HTMLImportStateResolver.cpp
+++ b/Source/core/html/imports/HTMLImportStateResolver.cpp
@@ -33,6 +33,7 @@
#include "core/html/imports/HTMLImport.h"
#include "core/html/imports/HTMLImportChild.h"
+#include "core/html/imports/HTMLImportLoader.h"
namespace WebCore {
@@ -40,10 +41,9 @@ inline bool HTMLImportStateResolver::isBlockingFollowers(HTMLImport* import)
{
if (!import->isSync())
return false;
- if (!toHTMLImportChild(import)->isFirst())
+ HTMLImportChild* child = toHTMLImportChild(import);
+ if (!child->loader()->isFirstImport(child))
return false;
- if (!import->loader())
- return true;
return !import->state().isReady();
}
« no previous file with comments | « Source/core/html/imports/HTMLImportChild.cpp ('k') | Source/core/html/imports/HTMLImportsController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698