Source/core/loader/FrameLoader.cpp - Issue 1161983005: FrameLoader: Prevent reentrancy on dispatchDidClearWindowObjectInMainWorld.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1161983005: FrameLoader: Prevent reentrancy on dispatchDidClearWindowObjectInMainWorld. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index df7b71458088ae0c1e25bcdf259046383eddf752..cf1c098634587c950695b081bd5ed5a20f24e0e9 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -117,6 +117,7 @@ FrameLoader::FrameLoader(LocalFrame* frame)

, m_didAccessInitialDocument(false)

, m_didAccessInitialDocumentTimer(this, &FrameLoader::didAccessInitialDocumentTimerFired)

, m_forcedSandboxFlags(SandboxNone)

+ , m_dispatchingDidClearWindowObjectInMainWorld(false)

{

}

@@ -1375,7 +1376,11 @@ void FrameLoader::dispatchDidClearWindowObjectInMainWorld()

if (!m_frame->script().canExecuteScripts(NotAboutToExecuteScript))

return;

+ if (m_dispatchingDidClearWindowObjectInMainWorld)

+ return;

+ m_dispatchingDidClearWindowObjectInMainWorld = true;

Nate Chapin 2015/05/29 21:28:00 TemporaryChange<bool> inDidClearWindowObject(m_dis

tommycli 2015/05/29 21:36:44 Done.

client()->dispatchDidClearWindowObjectInMainWorld();

+ m_dispatchingDidClearWindowObjectInMainWorld = false;

}

SandboxFlags FrameLoader::effectiveSandboxFlags() const

« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | no next file » | no next file with comments »