Eliminate "temporary" and "uninitialized" isolated worlds

Source/bindings/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple 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.
@@ skipping 308 matching lines @@
     return ScriptValue(object);
 }
 
 bool ScriptController::initializeMainWorld()
 {
     if (m_windowShell->isContextInitialized())
         return false;
     return windowShell(mainThreadNormalWorld())->isContextInitialized();
 }
 
-// FIXME: Remove this function. There is currently an issue with the inspector related to the call to dispatchDidClearWindowObjectInWorld in ScriptController::windowShell.
-static DOMWrapperWorld* existingWindowShellWorkaroundWorld()
-{
-    DEFINE_STATIC_LOCAL(RefPtr<DOMWrapperWorld>, world, (DOMWrapperWorld::createUninitializedWorld()));
-    return world.get();
-}
-
 V8DOMWindowShell* ScriptController::existingWindowShell(DOMWrapperWorld* world)
 {
     ASSERT(world);
 
     if (world->isMainWorld())
         return m_windowShell->isContextInitialized() ? m_windowShell.get() : 0;
 
     // FIXME: Remove this block. See comment with existingWindowShellWorkaroundWorld().
-    if (world->worldId() == DOMWrapperWorld::uninitializedWorldId) {
-        ASSERT(world == existingWindowShellWorkaroundWorld());
+    if (world == existingWindowShellWorkaroundWorld())
         return m_windowShell.get();
-    }
 
     IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world->worldId());
     if (iter == m_isolatedWorlds.end())
         return 0;
     return iter->value->isContextInitialized() ? iter->value.get() : 0;
 }
 
 V8DOMWindowShell* ScriptController::windowShell(DOMWrapperWorld* world)
 {
     ASSERT(world);
@@ skipping 16 matching lines @@
             // FIXME: Remove this if clause. See comment with existingWindowShellWorkaroundWorld().
             m_frame->loader()->dispatchDidClearWindowObjectInWorld(existingWindowShellWorkaroundWorld());
         } else
             m_frame->loader()->dispatchDidClearWindowObjectInWorld(world);
     }
     return shell;
 }
 
 void ScriptController::evaluateInIsolatedWorld(int worldID, const Vector<ScriptSourceCode>& sources, int extensionGroup, Vector<ScriptValue>* results)
 {
-    // Except in the test runner, worldID should be non 0 as it conflicts with the mainWorldId.
-    // FIXME: Change the test runner to perform this swap and make this an ASSERT.
-    if (UNLIKELY(!worldID))
-        worldID = DOMWrapperWorld::uninitializedWorldId;
+    ASSERT(worldID > 0);
 
     v8::HandleScope handleScope;
     v8::Local<v8::Array> v8Results;
     {
         v8::HandleScope evaluateHandleScope;
         RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(worldID, extensionGroup);
         V8DOMWindowShell* isolatedWorldShell = windowShell(world.get());
 
         if (!isolatedWorldShell->isContextInitialized())
             return;
 
         v8::Local<v8::Context> context = v8::Local<v8::Context>::New(isolatedWorldShell->context());
         v8::Context::Scope contextScope(context);
         v8::Local<v8::Array> resultArray = v8::Array::New(sources.size());
 
         for (size_t i = 0; i < sources.size(); ++i) {
             v8::Local<v8::Value> evaluationResult = compileAndRunScript(sources[i]);
             if (evaluationResult.IsEmpty())
                 evaluationResult = v8::Local<v8::Value>::New(v8::Undefined());
             resultArray->Set(i, evaluationResult);
         }
 
-        // Mark temporary shell for weak destruction.
-        if (worldID == DOMWrapperWorld::uninitializedWorldId) {
-            isolatedWorldShell->destroyIsolatedShell();
-            m_isolatedWorlds.remove(world->worldId());
-        }
-
         v8Results = evaluateHandleScope.Close(resultArray);
     }
 
     if (results && !v8Results.IsEmpty()) {
         for (size_t i = 0; i < v8Results->Length(); ++i)
             results->append(ScriptValue(v8Results->Get(i)));
     }
 }
 
 bool ScriptController::shouldBypassMainWorldContentSecurityPolicy()
@@ skipping 30 matching lines @@
     if (!isolatedWorld)
         return contextForWorld(this, mainThreadNormalWorld());
 
     Frame* frame = toFrameIfNotDetached(context);
     if (!m_frame)
         return v8::Local<v8::Context>();
 
     if (m_frame == frame)
         return v8::Local<v8::Context>::New(context);
 
-    // FIXME: Need to handle weak isolated worlds correctly.
-    if (isolatedWorld->createdFromUnitializedWorld())
-        return v8::Local<v8::Context>();
-
     return contextForWorld(this, isolatedWorld);
 }
 
 v8::Local<v8::Context> ScriptController::mainWorldContext()
 {
     return contextForWorld(this, mainThreadNormalWorld());
 }
 
 v8::Local<v8::Context> ScriptController::mainWorldContext(Frame* frame)
 {
@@ skipping 332 matching lines @@
         
         // DocumentWriter::replaceDocument can cause the DocumentLoader to get deref'ed and possible destroyed,
         // so protect it with a RefPtr.
         if (RefPtr<DocumentLoader> loader = m_frame->document()->loader())
             loader->writer()->replaceDocument(scriptResult, ownerDocument.get());
     }
     return true;
 }
 
 } // namespace WebCore