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

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

Issue 1119033003: Sever HTMLImportChild client connection upon disposal. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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 | « no previous file | Source/core/html/imports/HTMLImportChildClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/HTMLImportChild.cpp
diff --git a/Source/core/html/imports/HTMLImportChild.cpp b/Source/core/html/imports/HTMLImportChild.cpp
index d6c45866c5e1a708b6c777047b1f0d2eacbdc195..910f1dc2618c447ee0a37a064f38dbebea3a8b30 100644
--- a/Source/core/html/imports/HTMLImportChild.cpp
+++ b/Source/core/html/imports/HTMLImportChild.cpp
@@ -58,9 +58,6 @@ HTMLImportChild::~HTMLImportChild()
#if !ENABLE(OILPAN)
// dispose() should be called before the destruction.
ASSERT(!m_loader);
-
- if (m_client)
- m_client->importChildWasDestroyed(this);
#endif
}
@@ -108,6 +105,11 @@ void HTMLImportChild::dispose()
ASSERT(m_loader);
m_loader->removeImport(this);
m_loader = nullptr;
+
+ if (m_client) {
+ m_client->importChildWasDisposed(this);
+ m_client = nullptr;
+ }
}
Document* HTMLImportChild::document() const
« no previous file with comments | « no previous file | Source/core/html/imports/HTMLImportChildClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698