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

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

Issue 14334002: Delete WorldContextHandle in favor of DOMWrapperWorld (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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/ScriptEventListener.cpp
diff --git a/Source/bindings/v8/ScriptEventListener.cpp b/Source/bindings/v8/ScriptEventListener.cpp
index 31c3f74fd7f8bbb142c6f0bb41840a584ff38e91..1c00d9e47e9cc42d9baf45c064337607933bcafa 100644
--- a/Source/bindings/v8/ScriptEventListener.cpp
+++ b/Source/bindings/v8/ScriptEventListener.cpp
@@ -94,7 +94,7 @@ String eventListenerHandlerBody(Document* document, EventListener* listener)
v8::HandleScope scope;
V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(listener);
- v8::Handle<v8::Context> context = toV8Context(document, v8Listener->worldContext());
+ v8::Handle<v8::Context> context = toV8Context(document, v8Listener->world());
v8::Context::Scope contextScope(context);
v8::Handle<v8::Object> function = v8Listener->getListenerObject(document);
if (function.IsEmpty())
@@ -110,7 +110,7 @@ ScriptValue eventListenerHandler(Document* document, EventListener* listener)
v8::HandleScope scope;
V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(listener);
- v8::Handle<v8::Context> context = toV8Context(document, v8Listener->worldContext());
+ v8::Handle<v8::Context> context = toV8Context(document, v8Listener->world());
v8::Context::Scope contextScope(context);
v8::Handle<v8::Object> function = v8Listener->getListenerObject(document);
if (function.IsEmpty())
@@ -124,7 +124,7 @@ ScriptState* eventListenerHandlerScriptState(Frame* frame, EventListener* listen
return 0;
V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(listener);
v8::HandleScope scope;
- v8::Handle<v8::Context> v8Context = v8Listener->worldContext().adjustedContext(frame->script());
+ v8::Handle<v8::Context> v8Context = v8::Local<v8::Context>::New(frame->script()->windowShell(v8Listener->world())->context());
return ScriptState::forContext(*v8Context);
}
@@ -135,7 +135,7 @@ bool eventListenerHandlerLocation(Document* document, EventListener* listener, S
v8::HandleScope scope;
V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(listener);
- v8::Handle<v8::Context> context = toV8Context(document, v8Listener->worldContext());
+ v8::Handle<v8::Context> context = toV8Context(document, v8Listener->world());
v8::Context::Scope contextScope(context);
v8::Handle<v8::Object> object = v8Listener->getListenerObject(document);
if (object.IsEmpty() || !object->IsFunction())

Powered by Google App Engine
This is Rietveld 408576698