Eliminate "temporary" and "uninitialized" isolated worlds

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 31 matching lines @@
 
 namespace WebCore {
 
 class DOMDataStore;
 
 // This class represent a collection of DOM wrappers for a specific world.
 class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
 public:
     static const int mainWorldId = 0;
     static const int mainWorldExtensionGroup = 0;
-    static const int uninitializedWorldId = -1;
-    static const int uninitializedExtensionGroup = -1;
-    // If uninitializedWorldId is passed as worldId, the world will be assigned a temporary id instead.
     static PassRefPtr<DOMWrapperWorld> ensureIsolatedWorld(int worldId, int extensionGroup);
     ~DOMWrapperWorld();
 
     static bool isolatedWorldsExist() { return isolatedWorldCount; }
-    static bool isIsolatedWorldId(int worldId) { return worldId != mainWorldId && worldId != uninitializedWorldId; }
+    static bool isIsolatedWorldId(int worldId) { return worldId > mainWorldId; }
     static void getAllWorlds(Vector<RefPtr<DOMWrapperWorld> >& worlds);
 
     void makeContextWeak(v8::Handle<v8::Context>);
     void setIsolatedWorldField(v8::Handle<v8::Context>);
 
     static DOMWrapperWorld* isolatedWorld(v8::Handle<v8::Context> context)
     {
         ASSERT(contextHasCorrectPrototype(context));
         return static_cast<DOMWrapperWorld*>(context->GetAlignedPointerFromEmbedderData(v8ContextIsolatedWorld));
     }
@@ skipping 15 matching lines @@
     // applied correctly.
     static void setIsolatedWorldContentSecurityPolicy(int worldID, const String& policy);
     static void clearIsolatedWorldContentSecurityPolicy(int worldID);
     bool isolatedWorldHasContentSecurityPolicy();
 
     // Associate a logger with the world identified by worldId (worlId may be 0
     // identifying the main world).  
     static void setActivityLogger(int worldId, PassOwnPtr<V8DOMActivityLogger>);
     static V8DOMActivityLogger* activityLogger(int worldId);
 
-    // FIXME: this is a workaround for a problem in WebViewImpl.
-    // Do not use this anywhere else!!
-    static PassRefPtr<DOMWrapperWorld> createUninitializedWorld();
-
     bool isMainWorld() const { return m_worldId == mainWorldId; }
     bool isIsolatedWorld() const { return isIsolatedWorldId(m_worldId); }
-    bool createdFromUnitializedWorld() const { return m_worldId < uninitializedWorldId; }
 
     int worldId() const { return m_worldId; }
     int extensionGroup() const { return m_extensionGroup; }
     DOMDataStore* isolatedWorldDOMDataStore() const
     {
         ASSERT(isIsolatedWorld());
         return m_domDataStore.get();
     }
 
     static void setInitializingWindow(bool);
 
 private:
     static int isolatedWorldCount;
     static PassRefPtr<DOMWrapperWorld> createMainWorld();
     static bool contextHasCorrectPrototype(v8::Handle<v8::Context>);
 
     DOMWrapperWorld(int worldId, int extensionGroup);
 
     const int m_worldId;
     const int m_extensionGroup;
     OwnPtr<DOMDataStore> m_domDataStore;
 
     friend DOMWrapperWorld* mainThreadNormalWorld();
+    friend DOMWrapperWorld* existingWindowShellWorkaroundWorld();
 };
 
 DOMWrapperWorld* mainThreadNormalWorld();
 
+// FIXME: this is a workaround for a problem in ScriptController
+// Do not use this anywhere else!!
+DOMWrapperWorld* existingWindowShellWorkaroundWorld();

[haraken, 2013/04/12 02:14:19]

Maybe deprecatedWindowShellWorld is a better name?

[adamk, 2013/04/12 15:44:04]

I actually think the nearly-nonsensical name is a feature here. The "Do not use
this anywhere else!!" warning clearly wasn't enough to keep dcarney from using
it for this existingWindowShellWorkaround hack; the more specific (and weird) we
keep the name, the less likely someone will try to use it for something. 

+
 } // namespace WebCore
 
 #endif // DOMWrapperWorld_h