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

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

Issue 1032293002: Oilpan: dispose an HTMLImportsController on document detach/removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: No need to call dispose() when destructing HTMLImportsController Created 5 years, 9 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/HTMLImportTreeRoot.h ('k') | Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/imports/HTMLImportTreeRoot.cpp
diff --git a/Source/core/html/imports/HTMLImportTreeRoot.cpp b/Source/core/html/imports/HTMLImportTreeRoot.cpp
index 35371eb2b5f7e34445e5434999a80c2ee22458a1..842b5e41a5d43d7ef92f73492ee7566ad1a70d99 100644
--- a/Source/core/html/imports/HTMLImportTreeRoot.cpp
+++ b/Source/core/html/imports/HTMLImportTreeRoot.cpp
@@ -28,11 +28,17 @@ HTMLImportTreeRoot::HTMLImportTreeRoot(Document* document)
HTMLImportTreeRoot::~HTMLImportTreeRoot()
{
#if !ENABLE(OILPAN)
+ dispose();
+#endif
+}
+
+void HTMLImportTreeRoot::dispose()
+{
for (size_t i = 0; i < m_imports.size(); ++i)
- m_imports[i]->importDestroyed();
+ m_imports[i]->dispose();
m_imports.clear();
m_document = nullptr;
-#endif
+ m_recalcTimer.stop();
}
Document* HTMLImportTreeRoot::document() const
« no previous file with comments | « Source/core/html/imports/HTMLImportTreeRoot.h ('k') | Source/core/html/imports/HTMLImportsController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698