| Index: Source/bindings/v8/DOMWrapperWorld.cpp
|
| diff --git a/Source/bindings/v8/DOMWrapperWorld.cpp b/Source/bindings/v8/DOMWrapperWorld.cpp
|
| index b336abd43cdff691b2ae85d26f78b41aa0a83747..f85f8150896cc9e1c9a9ebd4904823aed78e7d33 100644
|
| --- a/Source/bindings/v8/DOMWrapperWorld.cpp
|
| +++ b/Source/bindings/v8/DOMWrapperWorld.cpp
|
| @@ -60,11 +60,11 @@ DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)
|
| {
|
| }
|
|
|
| -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 @@ static WorldMap& isolatedWorldMap()
|
| 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);
|
|
|