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

Unified Diff: Source/bindings/v8/ScriptController.cpp

Issue 263583002: Reland: Do not initialize v8::Context on |ScriptController::updateDocument|. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix_crash 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
« no previous file with comments | « no previous file | Source/core/testing/v8/WebCoreTestSupport.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/ScriptController.cpp
diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp
index 62146cf8e3f97726693078c9903832c0800bc74f..94c3f76179d258e4aa7d1d35c422b619a6aead6f 100644
--- a/Source/bindings/v8/ScriptController.cpp
+++ b/Source/bindings/v8/ScriptController.cpp
@@ -473,8 +473,8 @@ int ScriptController::contextDebugId(v8::Handle<v8::Context> context)
void ScriptController::updateDocument()
{
- // 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())
+ // For an uninitialized main window shell, do not incur the cost of context initialization.
+ if (!m_windowShell->isContextInitialized() || !m_windowShell->isGlobalInitialized() || m_frame->loader().stateMachine()->creatingInitialEmptyDocument())
dcarney 2014/04/30 07:01:13 is it possible that the third condition is enough
kouhei (in TOK) 2014/04/30 07:04:53 No. In this patch, we want to avoid creating windo
dcarney 2014/04/30 07:11:49 Ok, I see what you mean. I remember needing it wh
kouhei (in TOK) 2014/04/30 07:25:44 I think this should be 'if (!m_windowShell->isGlob
return;
if (!initializeMainWorld())
« no previous file with comments | « no previous file | Source/core/testing/v8/WebCoreTestSupport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698