Make DOMWrapperWorld::current() callable from workers

Source/bindings/v8/DOMWrapperWorld.h

 /*
  * 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef DOMWrapperWorld_h
 #define DOMWrapperWorld_h
 
 #include "bindings/v8/V8DOMActivityLogger.h"
 #include "bindings/v8/V8PerContextData.h"
 #include "platform/weborigin/SecurityOrigin.h"
-#include <v8.h>
+#include "wtf/MainThread.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
+#include <v8.h>
 
 namespace WebCore {
 
 class DOMDataStore;
 class ScriptController;
 class ExecutionContext;
 
 enum WorldIdConstants {
     MainWorldId = 0,
     // Embedder isolated worlds can use IDs in [1, 1<<29).
     EmbedderWorldIdLimit = (1 << 29),
     ScriptPreprocessorIsolatedWorldId,
     WorkerWorldId,
 };
 
 // This class represent a collection of DOM wrappers for a specific world.
 class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
 public:
     static PassRefPtr<DOMWrapperWorld> create(int worldId, int extensionGroup);
 
     static const int mainWorldExtensionGroup = 0;
     static PassRefPtr<DOMWrapperWorld> ensureIsolatedWorld(int worldId, int extensionGroup);
     ~DOMWrapperWorld();
 
     static bool isolatedWorldsExist() { return isolatedWorldCount; }
     static void getAllWorldsInMainThread(Vector<RefPtr<DOMWrapperWorld> >& worlds);
 
     static DOMWrapperWorld* world(v8::Handle<v8::Context> context)
     {
-        ASSERT(contextHasCorrectPrototype(context));

[dcarney, 2014/02/27 17:03:44]

This ASSERT has saved us a lot of debugging in the past.  It would be nice not
to lose it.

[haraken, 2014/02/28 00:06:25]

Done. Reverted back the ASSERT.

-        return V8PerContextDataHolder::from(context)->world();
+        V8PerContextDataHolder* contextHolder = V8PerContextDataHolder::from(context);
+        return contextHolder ? contextHolder->world() : 0;
     }
 
     // Will return null if there is no DOMWrapperWorld for the current v8::Context
-    static DOMWrapperWorld* current(v8::Isolate*);
+    static DOMWrapperWorld* current(v8::Isolate* isolate)
+    {
+        v8::Handle<v8::Context> context = isolate->GetCurrentContext();
+        if (context.IsEmpty()) {
+            // It's possible that DOMWrapperWorld::current() is called while window is being initialized.
+            // To make DOMWrapperWorld::current() workable during the initialization phase,
+            // we cache the world of the initializing window on worldOfInitializingWindow.
+            // If there is no initiazing window, worldOfInitializingWindow is 0.
+            return worldOfInitializingWindow;
+        }
+        return world(context);
+    }
+
     static DOMWrapperWorld* mainWorld();
 
     // Associates an isolated world (see above for description) with a security
     // origin. XMLHttpRequest instances used in that world will be considered
     // to come from that origin, not the frame's.
     static void setIsolatedWorldSecurityOrigin(int worldID, PassRefPtr<SecurityOrigin>);
     static void clearIsolatedWorldSecurityOrigin(int worldID);
     SecurityOrigin* isolatedWorldSecurityOrigin();
 
     // Associated an isolated world with a Content Security Policy. Resources
@@ skipping 14 matching lines @@
     static V8DOMActivityLogger* activityLogger(int worldId);
 
     bool isMainWorld() const { return m_worldId == MainWorldId; }
     bool isWorkerWorld() const { return m_worldId == WorkerWorldId; }
     bool isIsolatedWorld() const { return !isMainWorld() && !isWorkerWorld(); }
 
     int worldId() const { return m_worldId; }
     int extensionGroup() const { return m_extensionGroup; }
     DOMDataStore& domDataStore() { return *m_domDataStore; }
 
+    static void setWorldOfInitializingWindow(DOMWrapperWorld* world)
+    {
+        ASSERT(isMainThread());
+        worldOfInitializingWindow = world;
+    }
+
 private:
+    DOMWrapperWorld(int worldId, int extensionGroup);
+
     static unsigned isolatedWorldCount;
-
-    DOMWrapperWorld(int worldId, int extensionGroup);
-    static bool contextHasCorrectPrototype(v8::Handle<v8::Context>);
+    static DOMWrapperWorld* worldOfInitializingWindow;
 
     const int m_worldId;
     const int m_extensionGroup;
     OwnPtr<DOMDataStore> m_domDataStore;
 };
 
 } // namespace WebCore
 
 #endif // DOMWrapperWorld_h