bindings: Explicitly passes a v8::Isolate to DOMDataStore.

Source/bindings/core/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 30 matching lines @@
 #include "bindings/core/v8/WrapperTypeInfo.h"
 #include "core/dom/ExecutionContext.h"
 #include "wtf/HashTraits.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 unsigned DOMWrapperWorld::isolatedWorldCount = 0;
 DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0;
 
-PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGroup)
+PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(v8::Isolate* isolate, int worldId, int extensionGroup)
 {
-    return adoptRef(new DOMWrapperWorld(worldId, extensionGroup));
+    return adoptRef(new DOMWrapperWorld(isolate, worldId, extensionGroup));
 }
 
-DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)
+DOMWrapperWorld::DOMWrapperWorld(v8::Isolate* isolate, int worldId, int extensionGroup)
     : m_worldId(worldId)
     , m_extensionGroup(extensionGroup)
-    , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld())))
+    , m_domDataStore(adoptPtr(new DOMDataStore(isolate, isMainWorld())))
 {
 }
 
 DOMWrapperWorld& DOMWrapperWorld::mainWorld()
 {
     ASSERT(isMainThread());
-    DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create(MainWorldId, mainWorldExtensionGroup)));
+    DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create(v8::Isolate::GetCurrent(), MainWorldId, mainWorldExtensionGroup)));
     return *cachedMainWorld;
 }
 
 DOMWrapperWorld& DOMWrapperWorld::privateScriptIsolatedWorld()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, cachedPrivateScriptIsolatedWorld, ());
     if (!cachedPrivateScriptIsolatedWorld) {
-        cachedPrivateScriptIsolatedWorld = DOMWrapperWorld::create(PrivateScriptIsolatedWorldId, privateScriptIsolatedWorldExtensionGroup);
+        cachedPrivateScriptIsolatedWorld = DOMWrapperWorld::create(v8::Isolate::GetCurrent(), PrivateScriptIsolatedWorldId, privateScriptIsolatedWorldExtensionGroup);
         isolatedWorldCount++;
     }
     return *cachedPrivateScriptIsolatedWorld;
 }
 
 typedef HashMap<int, DOMWrapperWorld*> WorldMap;
 static WorldMap& isolatedWorldMap()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(WorldMap, map, ());
@@ skipping 36 matching lines @@
     m_domDataStore.clear();
 }
 
 #if ENABLE(ASSERT)
 static bool isIsolatedWorldId(int worldId)
 {
     return MainWorldId < worldId  && worldId < IsolatedWorldIdLimit;
 }
 #endif
 
-PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, int extensionGroup)
+PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(v8::Isolate* isolate, int worldId, int extensionGroup)
 {
     ASSERT(isIsolatedWorldId(worldId));
 
     WorldMap& map = isolatedWorldMap();
     WorldMap::AddResult result = map.add(worldId, 0);
     RefPtr<DOMWrapperWorld> world = result.storedValue->value;
     if (world) {
         ASSERT(world->worldId() == worldId);
         ASSERT(world->extensionGroup() == extensionGroup);
         return world.release();
     }
 
-    world = DOMWrapperWorld::create(worldId, extensionGroup);
+    world = DOMWrapperWorld::create(isolate, worldId, extensionGroup);
     result.storedValue->value = world.get();
     isolatedWorldCount++;
     return world.release();
 }
 
 typedef HashMap<int, RefPtr<SecurityOrigin> > IsolatedWorldSecurityOriginMap;
 static IsolatedWorldSecurityOriginMap& isolatedWorldSecurityOrigins()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_LOCAL(IsolatedWorldSecurityOriginMap, map, ());
@@ skipping 76 matching lines @@
     m_domObjectHolders.remove(holderBase);
 }
 
 void DOMWrapperWorld::weakCallbackForDOMObjectHolder(const v8::WeakCallbackData<v8::Value, DOMObjectHolderBase>& data)
 {
     DOMObjectHolderBase* holderBase = data.GetParameter();
     holderBase->world()->unregisterDOMObjectHolder(holderBase);
 }
 
 } // namespace blink