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

Unified Diff: Source/core/html/HTMLImportChild.cpp

Issue 135653006: [import] Refactoring: Get rid of BlockedFromCreatingDocument state (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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/HTMLImportChild.h ('k') | Source/core/html/HTMLImportsController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLImportChild.cpp
diff --git a/Source/core/html/HTMLImportChild.cpp b/Source/core/html/HTMLImportChild.cpp
index a708092dbbb3ac1db801ce5b7ddf10176ea28769..93d9c7fa13affc0eb8e887717b7ec6f546fe4f3e 100644
--- a/Source/core/html/HTMLImportChild.cpp
+++ b/Source/core/html/HTMLImportChild.cpp
@@ -69,8 +69,8 @@ void HTMLImportChild::wasAlreadyLoaded()
ASSERT(!m_loader);
ASSERT(m_clients.size());
- loaderWasResolved();
ensureLoader();
+ loaderWasResolved();
}
void HTMLImportChild::startLoading(const ResourcePtr<RawResource>& resource)
@@ -161,7 +161,6 @@ void HTMLImportChild::didFinishParsing()
void HTMLImportChild::didUnblockFromCreatingDocument()
{
HTMLImport::didUnblockFromCreatingDocument();
- ASSERT(!m_loader || !m_loader->isOwnedBy(this));
ensureLoader();
}
@@ -204,6 +203,11 @@ bool HTMLImportChild::isDone() const
return m_loader && m_loader->isDone();
}
+bool HTMLImportChild::hasLoader() const
+{
+ return m_loader;
+}
+
bool HTMLImportChild::ownsLoader() const
{
return m_loader->isOwnedBy(this);
« no previous file with comments | « Source/core/html/HTMLImportChild.h ('k') | Source/core/html/HTMLImportsController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698