Delete WorldContextHandle in favor of DOMWrapperWorld

Source/bindings/v8/ScriptEventListener.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
     return V8LazyEventListener::create(name.localName().string(), eventParameterName(frame->document()->isSVGDocument()), value, sourceURL, position, 0);
 }
 
 String eventListenerHandlerBody(Document* document, EventListener* listener)
 {
     if (listener->type() != EventListener::JSEventListenerType)
         return "";
 
     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())
         return "";
 
     return toWebCoreStringWithNullCheck(function);
 }
 
 ScriptValue eventListenerHandler(Document* document, EventListener* listener)
 {
     if (listener->type() != EventListener::JSEventListenerType)
         return ScriptValue();
 
     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())
         return ScriptValue();
     return ScriptValue(function);
 }
 
 ScriptState* eventListenerHandlerScriptState(Frame* frame, EventListener* listener)
 {
     if (listener->type() != EventListener::JSEventListenerType)
         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);
 }
 
 bool eventListenerHandlerLocation(Document* document, EventListener* listener, String& sourceName, String& scriptId, int& lineNumber)
 {
     if (listener->type() != EventListener::JSEventListenerType)
         return false;
 
     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())
         return false;
 
     v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(object);
     v8::Handle<v8::Value> scriptIdValue = function->GetScriptId();
     scriptId = toWebCoreStringWithUndefinedOrNullCheck(scriptIdValue);
     v8::ScriptOrigin origin = function->GetScriptOrigin();
     if (origin.ResourceName()->IsString() && !origin.ResourceName().IsEmpty())
         sourceName = toWebCoreString(origin.ResourceName());
     else
         sourceName = "";
     lineNumber = function->GetScriptLineNumber();
     return true;
 }
 
 } // namespace WebCore