Revert 167276 "Remove isolatedWorldForEnteredContext() and isola..."

trunk/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 44 matching lines @@
 
 DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup)
     : m_worldId(worldId)
     , m_extensionGroup(extensionGroup)
     , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld())))
 {
 }
 
 DOMWrapperWorld* DOMWrapperWorld::current(v8::Isolate* isolate)
 {
+    ASSERT(isolate->InContext());
     v8::Handle<v8::Context> context = isolate->GetCurrentContext();
-    if (context.IsEmpty() || !toDOMWindow(context))
+    if (!toDOMWindow(context))
         return 0;
-    return world(context);
+    ASSERT(isMainThread());
+    if (DOMWrapperWorld* world = isolatedWorld(context))
+        return world;
+    return mainWorld();
 }
 
 DOMWrapperWorld* DOMWrapperWorld::mainWorld()
 {
     ASSERT(isMainThread());
     DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create(MainWorldId, mainWorldExtensionGroup)));
     return cachedMainWorld;
 }
 
 typedef HashMap<int, DOMWrapperWorld*> WorldMap;
@@ skipping 142 matching lines @@
     DOMActivityLoggerMap::iterator it = loggers.find(worldId);
     return it == loggers.end() ? 0 : it->value.get();
 }
 
 bool DOMWrapperWorld::contextHasCorrectPrototype(v8::Handle<v8::Context> context)
 {
     return V8WindowShell::contextHasCorrectPrototype(context);
 }
 
 } // namespace WebCore