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

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

Issue 683013002: Extract a DOMWindow interface from LocalDOMWindow and use it in the idl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on top of DOMWindow moves and UseCounter overload for Frame Created 6 years, 1 month 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 2e3a2a9584739aa0bb6ce813acbde7601f2a690a..2a9392f396e878acb87913c046a013737864bf8e 100644
--- a/Source/bindings/core/v8/ScriptController.cpp
+++ b/Source/bindings/core/v8/ScriptController.cpp
@@ -384,7 +384,7 @@ static NPObject* createScriptObject(LocalFrame* frame, v8::Isolate* isolate)
return createNoScriptObject();
ScriptState::Scope scope(scriptState);
- LocalDOMWindow* window = frame->domWindow();
+ LocalDOMWindow* window = frame->localDOMWindow();
v8::Handle<v8::Value> global = toV8(window, scriptState->context()->Global(), scriptState->isolate());
ASSERT(global->IsObject());
return npCreateV8ScriptObject(isolate, 0, v8::Handle<v8::Object>::Cast(global), window);
@@ -420,7 +420,7 @@ NPObject* ScriptController::createScriptObjectForPluginElement(HTMLPlugInElement
return createNoScriptObject();
ScriptState::Scope scope(scriptState);
- LocalDOMWindow* window = m_frame->domWindow();
+ LocalDOMWindow* window = m_frame->localDOMWindow();
v8::Handle<v8::Value> v8plugin = toV8(plugin, scriptState->context()->Global(), scriptState->isolate());
if (!v8plugin->IsObject())
return createNoScriptObject();

Powered by Google App Engine
This is Rietveld 408576698