Remove Isolated Worlds from Sky

sky/engine/bindings/core/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. 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
@@ skipping 144 matching lines @@
 {
     if (m_windowProxy->isContextInitialized())
         return false;
     return windowProxy(DOMWrapperWorld::mainWorld())->isContextInitialized();
 }
 
 WindowProxy* ScriptController::existingWindowProxy(DOMWrapperWorld& world)
 {
     if (world.isMainWorld())
         return m_windowProxy->isContextInitialized() ? m_windowProxy.get() : 0;
-
-    IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId());
-    if (iter == m_isolatedWorlds.end())
-        return 0;
-    return iter->value->isContextInitialized() ? iter->value.get() : 0;
+    return 0;
 }
 
 WindowProxy* ScriptController::windowProxy(DOMWrapperWorld& world)
 {
-    WindowProxy* windowProxy = 0;
-    if (world.isMainWorld()) {
-        windowProxy = m_windowProxy.get();
-    } else {
-        IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId());
-        if (iter != m_isolatedWorlds.end()) {
-            windowProxy = iter->value.get();
-        } else {
-            OwnPtr<WindowProxy> isolatedWorldWindowProxy = WindowProxy::create(m_frame, world, m_isolate);
-            windowProxy = isolatedWorldWindowProxy.get();
-            m_isolatedWorlds.set(world.worldId(), isolatedWorldWindowProxy.release());
-        }
-    }
-    windowProxy->initializeIfNeeded();
-    return windowProxy;
+    m_windowProxy->initializeIfNeeded();
+    return m_windowProxy.get();
 }
 
 V8Extensions& ScriptController::registeredExtensions()
 {
     DEFINE_STATIC_LOCAL(V8Extensions, extensions, ());
     return extensions;
 }
 
 void ScriptController::registerExtensionIfNeeded(v8::Extension* extension)
 {
@@ skipping 16 matching lines @@
     for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin(); iter != m_isolatedWorlds.end(); ++iter)
         iter->value->clearForNavigation();
     blink::Platform::current()->histogramCustomCounts("WebCore.ScriptController.clearWindowProxy", (currentTime() - start) * 1000, 0, 10000, 50);
 }
 
 void ScriptController::setCaptureCallStackForUncaughtExceptions(bool value)
 {
     v8::V8::SetCaptureStackTraceForUncaughtExceptions(value, ScriptCallStack::maxCallStackSizeToCapture, stackTraceOptions);
 }
 
-void ScriptController::setWorldDebugId(int worldId, int debuggerId)
+void ScriptController::setWorldDebugId(int debuggerId)
 {
     ASSERT(debuggerId > 0);
-    bool isMainWorld = worldId == MainWorldId;
-    WindowProxy* windowProxy = 0;
-    if (isMainWorld) {
-        windowProxy = m_windowProxy.get();
-    } else {
-        IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(worldId);
-        if (iter != m_isolatedWorlds.end())
-            windowProxy = iter->value.get();
-    }
-    if (!windowProxy || !windowProxy->isContextInitialized())
+    if (!m_windowProxy || !m_windowProxy->isContextInitialized())
         return;
     v8::HandleScope scope(m_isolate);
-    v8::Local<v8::Context> context = windowProxy->context();
-    const char* worldName = isMainWorld ? "page" : "injected";
-    V8PerContextDebugData::setContextDebugData(context, worldName, debuggerId);
+    v8::Local<v8::Context> context = m_windowProxy->context();
+    V8PerContextDebugData::setContextDebugData(context, "page", debuggerId);
 }
 
 void ScriptController::updateDocument()
 {
     // For an uninitialized main window windowProxy, do not incur the cost of context initialization.
     if (!m_windowProxy->isGlobalInitialized())
         return;
 
     if (!initializeMainWorld())
         windowProxy(DOMWrapperWorld::mainWorld())->updateDocument();
@@ skipping 34 matching lines @@
 
     v8::Local<v8::Value> object = executeScriptAndReturnValue(scriptState->context(), sourceCode);
     m_sourceURL = savedSourceURL;
 
     if (object.IsEmpty())
         return v8::Local<v8::Value>();
 
     return handleScope.Escape(object);
 }
 
-void ScriptController::executeScriptInIsolatedWorld(int worldID, const Vector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value> >* results)
-{
-    ASSERT(worldID > 0);
-
-    RefPtr<DOMWrapperWorld> world = DOMWrapperWorld::ensureIsolatedWorld(worldID, extensionGroup);
-    WindowProxy* isolatedWorldWindowProxy = windowProxy(*world);
-    if (!isolatedWorldWindowProxy->isContextInitialized())
-        return;
-
-    ScriptState* scriptState = isolatedWorldWindowProxy->scriptState();
-    v8::EscapableHandleScope handleScope(scriptState->isolate());
-    ScriptState::Scope scope(scriptState);
-    v8::Local<v8::Array> resultArray = v8::Array::New(m_isolate, sources.size());
-
-    for (size_t i = 0; i < sources.size(); ++i) {
-        v8::Local<v8::Value> evaluationResult = executeScriptAndReturnValue(scriptState->context(), sources[i]);
-        if (evaluationResult.IsEmpty())
-            evaluationResult = v8::Local<v8::Value>::New(m_isolate, v8::Undefined(m_isolate));
-        resultArray->Set(i, evaluationResult);
-    }
-
-    if (results) {
-        for (size_t i = 0; i < resultArray->Length(); ++i)
-            results->append(handleScope.Escape(resultArray->Get(i)));
-    }
-}
-
 void ScriptController::executeModuleScript(AbstractModule& module, const String& source, const TextPosition& textPosition)
 {
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> context = toV8Context(m_frame, DOMWrapperWorld::mainWorld());
     if (context.IsEmpty())
         return;
 
     ScriptState* scriptState = ScriptState::from(context);
     ScriptState::Scope scope(scriptState);
 
@@ skipping 23 matching lines @@
                     scriptModule.resolvedDependencies.append(actual);
                 }
             }
         }
     }
 
     V8ScriptRunner::runModule(m_isolate, m_frame->document(), scriptModule);
 }
 
 } // namespace blink