Make DOMWrapperWorld::current() callable from workers

Source/bindings/v8/V8WindowShell.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 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 49 matching lines @@
 #include "wtf/text/CString.h"
 #include <algorithm>
 #include <utility>
 #include <v8-debug.h>
 #include <v8.h>
 
 namespace WebCore {
 
 static bool contextBeingInitialized = false;
 
+bool V8WindowShell::contextIsBeingInitialized()
+{
+    return contextBeingInitialized;
+}
+
 static void checkDocumentWrapper(v8::Handle<v8::Object> wrapper, Document* document)
 {
     ASSERT(V8Document::toNative(wrapper) == document);
     ASSERT(!document->isHTMLDocument() || (V8Document::toNative(v8::Handle<v8::Object>::Cast(wrapper->GetPrototype())) == document));
 }
 
 static void setInjectedScriptContextDebugId(v8::Handle<v8::Context> targetContext, int debugId)
 {
     V8PerContextDebugData::setContextDebugData(targetContext, "injected", debugId);
 }
@@ skipping 101 matching lines @@
 // the frame. However, a new inner window is created for the new page.
 // If there are JS code holds a closure to the old inner window,
 // it won't be able to reach the outer window via its global object.
 bool V8WindowShell::initializeIfNeeded()
 {
     if (m_contextHolder)
         return true;
 
     ASSERT(!contextBeingInitialized);
     contextBeingInitialized = true;
+    DOMWrapperWorld::setWorldOfInitializingWindow(m_world.get());
     bool result = initialize();
     contextBeingInitialized = false;
+    DOMWrapperWorld::setWorldOfInitializingWindow(0);
     return result;
 }
 
 bool V8WindowShell::initialize()
 {
     TRACE_EVENT0("v8", "V8WindowShell::initialize");
     TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "InitializeWindow");
 
     v8::HandleScope handleScope(m_isolate);
 
@@ skipping 302 matching lines @@
 
 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin)
 {
     ASSERT(m_world->isMainWorld());
     if (!m_contextHolder)
         return;
     v8::HandleScope handleScope(m_isolate);
     setSecurityToken(origin);
 }
 
-bool V8WindowShell::contextHasCorrectPrototype(v8::Handle<v8::Context> context)
-{
-    if (!isMainThread())
-        return true;
-    // We're initializing the context, so it is not yet in a status where we can
-    // validate the context.
-    if (contextBeingInitialized)
-        return true;
-    return !!toDOMWindow(context);
-}
-
 } // WebCore