Remove Isolated Worlds from Sky

sky/engine/bindings/core/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 28 matching lines @@
 #include "sky/engine/wtf/RefPtr.h"
 #include "sky/engine/wtf/text/WTFString.h"
 #include "v8/include/v8.h"
 
 namespace blink {
 
 class DOMDataStore;
 class ExecutionContext;
 class ScriptController;
 
-enum WorldIdConstants {
-    MainWorldId = 0,
-    // Embedder isolated worlds can use IDs in [1, 1<<29).
-    EmbedderWorldIdLimit = (1 << 29),
-    IsolatedWorldIdLimit,
-    TestingWorldId,
+enum FakeWorldMarker {
+    MainWorld,
+    FakeWorld, // Used by garbage collection and testing, not sure why.
 };
 
 // This class represent a collection of DOM wrappers for a specific world.
 class DOMWrapperWorld : public RefCounted<DOMWrapperWorld> {
 public:
-    static PassRefPtr<DOMWrapperWorld> create(int worldId = -1, int extensionGroup = -1);
+    static PassRefPtr<DOMWrapperWorld> create(FakeWorldMarker);
 
-    static const int mainWorldExtensionGroup = 0;
-    static PassRefPtr<DOMWrapperWorld> ensureIsolatedWorld(int worldId, int extensionGroup);
     ~DOMWrapperWorld();
     void dispose();
 
-    static bool isolatedWorldsExist() { return isolatedWorldCount; }
-    static void allWorldsInMainThread(Vector<RefPtr<DOMWrapperWorld> >& worlds);
-
     static DOMWrapperWorld& world(v8::Handle<v8::Context> context)
     {
         return ScriptState::from(context)->world();
     }
 
     static DOMWrapperWorld& current(v8::Isolate* isolate)
     {
         if (isMainThread() && worldOfInitializingWindow) {
             // It's possible that current() is being called while window is being initialized.
             // In order to make 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(isolate->GetCurrentContext());
     }
 
     static DOMWrapperWorld& mainWorld();
 
-    static void setIsolatedWorldHumanReadableName(int worldID, const String&);
-    String isolatedWorldHumanReadableName();
+    bool isMainWorld() const { return !m_isFakeWorld; }
 
-    bool isMainWorld() const { return m_worldId == MainWorldId; }
-    bool isIsolatedWorld() const { return MainWorldId < m_worldId  && m_worldId < IsolatedWorldIdLimit; }
-
-    int worldId() const { return m_worldId; }
-    int extensionGroup() const { return m_extensionGroup; }
     DOMDataStore& domDataStore() const { return *m_domDataStore; }
 
     static void setWorldOfInitializingWindow(DOMWrapperWorld* world)
     {
         ASSERT(isMainThread());
         worldOfInitializingWindow = world;
     }
     // FIXME: Remove this method once we fix crbug.com/345014.
     static bool windowIsBeingInitialized() { return !!worldOfInitializingWindow; }
 
@@ skipping 38 matching lines @@
     };
 
 public:
     template<typename T>
     void registerDOMObjectHolder(v8::Isolate* isolate, T* object, v8::Handle<v8::Value> wrapper)
     {
         registerDOMObjectHolderInternal(DOMObjectHolder<T>::create(isolate, object, wrapper));
     }
 
 private:
-    DOMWrapperWorld(int worldId, int extensionGroup);
+    DOMWrapperWorld(FakeWorldMarker);
 
     static void weakCallbackForDOMObjectHolder(const v8::WeakCallbackData<v8::Value, DOMObjectHolderBase>&);
     void registerDOMObjectHolderInternal(PassOwnPtr<DOMObjectHolderBase>);
     void unregisterDOMObjectHolder(DOMObjectHolderBase*);
 
     static unsigned isolatedWorldCount;
     static DOMWrapperWorld* worldOfInitializingWindow;
 
-    const int m_worldId;
-    const int m_extensionGroup;
+    bool m_isFakeWorld;
     OwnPtr<DOMDataStore> m_domDataStore;
     HashSet<OwnPtr<DOMObjectHolderBase> > m_domObjectHolders;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_BINDINGS_CORE_V8_DOMWRAPPERWORLD_H_