Source/bindings/v8/ScriptController.cpp - Issue 268623003: Revert of Do not initialize v8::Context on |ScriptController::updateDocument|.

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/bindings/v8/ScriptController.cpp

Issue 268623003: Revert of Do not initialize v8::Context on |ScriptController::updateDocument|. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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

Index: Source/bindings/v8/ScriptController.cpp

diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp

index 6140e4c770d091f7879962d80ef20ed030668ff0..62146cf8e3f97726693078c9903832c0800bc74f 100644

--- a/Source/bindings/v8/ScriptController.cpp

+++ b/Source/bindings/v8/ScriptController.cpp

@@ -473,8 +473,8 @@

void ScriptController::updateDocument()

{

- // For an uninitialized main window shell, do not incur the cost of context initialization.

- if (!m_windowShell->isGlobalInitialized())

+ // For an uninitialized main window shell, do not incur the cost of context initialization during FrameLoader::init().

+ if ((!m_windowShell->isContextInitialized() || !m_windowShell->isGlobalInitialized()) && m_frame->loader().stateMachine()->creatingInitialEmptyDocument())

return;

if (!initializeMainWorld())

« no previous file with comments | « no previous file | Source/core/testing/v8/WebCoreTestSupport.cpp » ('j') | no next file with comments »