Index: trunk/Source/bindings/v8/DOMWrapperWorld.cpp |
=================================================================== |
--- trunk/Source/bindings/v8/DOMWrapperWorld.cpp (revision 170423) |
+++ trunk/Source/bindings/v8/DOMWrapperWorld.cpp (working copy) |
@@ -60,11 +60,11 @@ |
{ |
} |
-DOMWrapperWorld* DOMWrapperWorld::mainWorld() |
+DOMWrapperWorld& DOMWrapperWorld::mainWorld() |
{ |
ASSERT(isMainThread()); |
DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create(MainWorldId, mainWorldExtensionGroup))); |
- return cachedMainWorld; |
+ return *cachedMainWorld; |
} |
typedef HashMap<int, DOMWrapperWorld*> WorldMap; |
@@ -78,7 +78,7 @@ |
void DOMWrapperWorld::allWorldsInMainThread(Vector<RefPtr<DOMWrapperWorld> >& worlds) |
{ |
ASSERT(isMainThread()); |
- worlds.append(mainWorld()); |
+ worlds.append(&mainWorld()); |
WorldMap& isolatedWorlds = isolatedWorldMap(); |
for (WorldMap::iterator it = isolatedWorlds.begin(); it != isolatedWorlds.end(); ++it) |
worlds.append(it->value); |