Remove isolatedWorldForEnteredContext() and isolatedWorldForIsolate()

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 49 matching lines @@
     if (isMainWorld())
         m_domDataStore = adoptPtr(new DOMDataStore(MainWorld));
     else if (isIsolatedWorld())
         m_domDataStore = adoptPtr(new DOMDataStore(IsolatedWorld));
     else if (isWorkerWorld())
         m_domDataStore = adoptPtr(new DOMDataStore(WorkerWorld));
 }
 
 DOMWrapperWorld* DOMWrapperWorld::current(v8::Isolate* isolate)
 {
-    ASSERT(isolate->InContext());
     v8::Handle<v8::Context> context = isolate->GetCurrentContext();
-    if (!toDOMWindow(context))
+    if (context.IsEmpty() || !contextHasCorrectPrototype(context))
         return 0;
-    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;
@@ skipping 143 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