Eliminate "temporary" and "uninitialized" isolated worlds

Source/bindings/v8/DOMWrapperWorld.cpp

 /*
  * 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 "WrapperTypeInfo.h"
 #include <wtf/HashTraits.h>
 #include <wtf/MainThread.h>
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
 int DOMWrapperWorld::isolatedWorldCount = 0;
 static bool initializingWindow = false;
 
-PassRefPtr<DOMWrapperWorld>  DOMWrapperWorld::createUninitializedWorld()
-{
-    return adoptRef(new DOMWrapperWorld(uninitializedWorldId, uninitializedExtensionGroup));
-}
-
 void DOMWrapperWorld::setInitializingWindow(bool initializing)
 {
     initializingWindow = initializing;
 }
 
 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::createMainWorld()
 {
     return adoptRef(new DOMWrapperWorld(mainWorldId, mainWorldExtensionGroup));
 }
 
 DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)
     : m_worldId(worldId)
     , m_extensionGroup(extensionGroup)
 {
     if (isIsolatedWorld())
         m_domDataStore = adoptPtr(new DOMDataStore(IsolatedWorld));
 }
 
 DOMWrapperWorld* mainThreadNormalWorld()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, cachedNormalWorld, (DOMWrapperWorld::createMainWorld()));
     return cachedNormalWorld.get();
 }
 
+// FIXME: Remove this function. There is currently an issue with the inspector related to the call to dispatchDidClearWindowObjectInWorld in ScriptController::windowShell.
+DOMWrapperWorld* existingWindowShellWorkaroundWorld()
+{
+    DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, world, (adoptRef(new DOMWrapperWorld(DOMWrapperWorld::mainWorldId - 1, DOMWrapperWorld::mainWorldExtensionGroup - 1))));
+    return world.get();
+}
+
 bool DOMWrapperWorld::contextHasCorrectPrototype(v8::Handle<v8::Context> context)
 {
     ASSERT(isMainThread());
     if (initializingWindow)
         return true;
     return V8DOMWrapper::isWrapperOfType(toInnerGlobalObject(context), &V8DOMWindow::info);
 }
 
 template<>
 void WeakHandleListener<DOMWrapperWorld>::callback(v8::Isolate* isolate, v8::Persistent<v8::Value> object, DOMWrapperWorld* world)
@@ skipping 48 matching lines @@
         ASSERT_NOT_REACHED();
         return;
     }
     ASSERT(i->value == this);
 
     map.remove(i);
     isolatedWorldCount--;
     ASSERT(map.size() == isolatedWorldCount);
 }
 
-static int temporaryWorldId = DOMWrapperWorld::uninitializedWorldId-1;
-
 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, int extensionGroup)
 {
-    ASSERT(worldId != mainWorldId);
-    ASSERT(worldId >= uninitializedWorldId);
+    ASSERT(worldId > mainWorldId);
 
     WorldMap& map = isolatedWorldMap();
-    if (worldId == uninitializedWorldId)
-        worldId = temporaryWorldId--;
-    else {
-        WorldMap::iterator i = map.find(worldId);
-        if (i != map.end()) {
-            ASSERT(i->value->worldId() == worldId);
-            ASSERT(i->value->extensionGroup() == extensionGroup);
-            return i->value;
-        }
+    WorldMap::AddResult result = map.add(worldId, 0);

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

Shouldn't this be map.find()? And then you need to call map.add() after creating
a new world.

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

Odd though this code looks, this is the idiomatic STL/WTF way of adding or
updating a map with a single hash lookup.  The speed probably doesn't matter in
this case, but I'm very used to writing it at this point.

Note that add() only adds the new key/value pair if it's new.

+    RefPtr<DOMWrapperWorld> world = result.iterator->value;
+    if (world) {
+        ASSERT(world->worldId() == worldId);
+        ASSERT(world->extensionGroup() == extensionGroup);
+        return world.release();
     }
 
-    RefPtr<DOMWrapperWorld> world = adoptRef(new DOMWrapperWorld(worldId, extensionGroup));
-    map.add(worldId, world.get());
+    world = adoptRef(new DOMWrapperWorld(worldId, extensionGroup));
+    result.iterator->value = world.get();
     isolatedWorldCount++;
     ASSERT(map.size() == isolatedWorldCount);
 
     return world.release();
 }
 
 typedef HashMap<int, RefPtr<SecurityOrigin> > IsolatedWorldSecurityOriginMap;
 static IsolatedWorldSecurityOriginMap& isolatedWorldSecurityOrigins()
 {
     ASSERT(isMainThread());
@@ skipping 69 matching lines @@
 } 
 
 V8DOMActivityLogger* DOMWrapperWorld::activityLogger(int worldId)
 {
     DOMActivityLoggerMap& loggers = domActivityLoggers();
     DOMActivityLoggerMap::iterator it = loggers.find(worldId);   
     return it == loggers.end() ? 0 : it->value.get();
 } 
 
 } // namespace WebCore