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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 1166493003: Prevent reentrancy of WebFrameClient::didClearWindowObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fxied android compile Created 5 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 | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index 48d220f6f91568247d524e6583d944382bd5d6cc..79c58bde28e8949779411b586a1046d77410f001 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -1365,6 +1365,10 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject()
InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
+ if (m_dispatchingDidClearWindowObjectInMainWorld)
+ return;
+ TemporaryChange<bool>
+ inDidClearWindowObject(m_dispatchingDidClearWindowObjectInMainWorld, true);
// We just cleared the document, not the entire window object, but for the
// embedder that's close enough.
client()->dispatchDidClearWindowObjectInMainWorld();
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698