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

Unified Diff: Source/core/html/parser/HTMLDocumentParser.cpp

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Handle FrameHost-detached access in FrameLoader::allowPlugins() Created 6 years, 3 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/HTMLTextFormControlElementTest.cpp ('k') | Source/core/html/parser/XSSAuditorDelegate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/parser/HTMLDocumentParser.cpp
diff --git a/Source/core/html/parser/HTMLDocumentParser.cpp b/Source/core/html/parser/HTMLDocumentParser.cpp
index 711715617e9eb85849c9b775a231362b6a6b99c8..70763cdb673fb6c384bc8356725af4e575ca56d3 100644
--- a/Source/core/html/parser/HTMLDocumentParser.cpp
+++ b/Source/core/html/parser/HTMLDocumentParser.cpp
@@ -239,6 +239,17 @@ void HTMLDocumentParser::prepareToStopParsing()
if (isDetached())
return;
+#if ENABLE(OILPAN)
+ // The Oilpan sub-variant of the above; the document (parser) may
+ // only have stopped by this stage, but the parser hasn't been cancelled
+ // and detached. (The will not currently happen when the LocalFrame
+ // is finalized either.) Hence, a stopped parser is the strongest
+ // condition we can test for here. Bail, if so.
+ if (isStopped())
+ return;
+#endif
+
+
attemptToRunDeferredScriptsAndEnd();
}
« no previous file with comments | « Source/core/html/HTMLTextFormControlElementTest.cpp ('k') | Source/core/html/parser/XSSAuditorDelegate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698