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

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

Issue 538933002: ScriptState::contextIsEmpty shouldn't return true for a context whose global object is detached (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
Index: Source/bindings/core/v8/ScriptController.cpp
diff --git a/Source/bindings/core/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp
index 30482004680d0ffe285856ea4f2d91cca0fb404e..28a3e6b7cbf2d0e0bf7103d38d0bc415f5cc9bf1 100644
--- a/Source/bindings/core/v8/ScriptController.cpp
+++ b/Source/bindings/core/v8/ScriptController.cpp
@@ -259,7 +259,7 @@ TextPosition ScriptController::eventHandlerPosition() const
void ScriptController::bindToWindowObject(LocalFrame* frame, const String& key, NPObject* object)
{
ScriptState* scriptState = ScriptState::forMainWorld(frame);
- if (scriptState->contextIsEmpty())
+ if (scriptState->contextIsValue())
return;
ScriptState::Scope scope(scriptState);
@@ -368,7 +368,7 @@ static NPObject* createNoScriptObject()
static NPObject* createScriptObject(LocalFrame* frame, v8::Isolate* isolate)
{
ScriptState* scriptState = ScriptState::forMainWorld(frame);
- if (scriptState->contextIsEmpty())
+ if (scriptState->contextIsValue())
return createNoScriptObject();
ScriptState::Scope scope(scriptState);
@@ -404,7 +404,7 @@ NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement
return createNoScriptObject();
ScriptState* scriptState = ScriptState::forMainWorld(m_frame);
- if (scriptState->contextIsEmpty())
+ if (scriptState->contextIsValue())
return createNoScriptObject();
ScriptState::Scope scope(scriptState);

Powered by Google App Engine
This is Rietveld 408576698