Delete WorldContextHandle in favor of DOMWrapperWorld

Source/bindings/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 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 31 matching lines @@
 #include "V8DOMStringList.h"
 #include "V8DOMWindow.h"
 #include "V8Element.h"
 #include "V8NodeFilterCondition.h"
 #include "V8ObjectConstructor.h"
 #include "V8WorkerContext.h"
 #include "V8XPathNSResolver.h"
 #include "WebCoreMemoryInstrumentation.h"
 #include "WorkerContext.h"
 #include "WorkerScriptController.h"
-#include "WorldContextHandle.h"
 #include "XPathNSResolver.h"
 #include <wtf/MathExtras.h>
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Threading.h>
 #include <wtf/text/AtomicString.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuffer.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
@@ skipping 260 matching lines @@
 {
     DOMWindow* window = toDOMWindow(context);
     if (window->isCurrentlyDisplayedInFrame())
         return window->frame();
     // We return 0 here because |context| is detached from the Frame. If we
     // did return |frame| we could get in trouble because the frame could be
     // navigated to another security origin.
     return 0;
 }
 
-v8::Local<v8::Context> toV8Context(ScriptExecutionContext* context, const WorldContextHandle& worldContext)
-{
-    if (context->isDocument()) {
-        if (Frame* frame = toDocument(context)->frame())
-            return worldContext.adjustedContext(frame->script());
-    } else if (context->isWorkerContext()) {
-        if (WorkerScriptController* script = static_cast<WorkerContext*>(context)->script())
-            return script->context();
-    }
-    return v8::Local<v8::Context>();
-}
-
 v8::Local<v8::Context> toV8Context(ScriptExecutionContext* context, DOMWrapperWorld* world)
 {
     if (context->isDocument()) {
         ASSERT(world);
         if (Frame* frame = toDocument(context)->frame())
             return v8::Local<v8::Context>::New(frame->script()->windowShell(world)->context());
     } else if (context->isWorkerContext()) {
         ASSERT(!world);
         if (WorkerScriptController* script = static_cast<WorkerContext*>(context)->script())
             return script->context();
@@ skipping 50 matching lines @@
     if (!DOMWrapperWorld::isolatedWorldsExist())
         return MainWorld;
     ASSERT(!v8::Context::GetEntered().IsEmpty());
     DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context::GetEntered());
     if (isolatedWorld)
         return IsolatedWorld;
     return MainWorld;
 }
 
 } // namespace WebCore