Revert of DevTools: do not use ScriptFunctionCall in the front-end embedder.

third_party/WebKit/Source/core/inspector/DevToolsHost.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 11 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/inspector/DevToolsHost.h"
 
+#include "bindings/core/v8/ScriptFunctionCall.h"
 #include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8ScriptRunner.h"
 #include "core/clipboard/Pasteboard.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/inspector/InspectorFrontendClient.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/Page.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/HostWindow.h"
+#include "platform/ScriptForbiddenScope.h"
 #include "platform/SharedBuffer.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 
 namespace blink {
 
 class FrontendMenuProvider final : public ContextMenuProvider {
 public:
-    static PassRefPtrWillBeRawPtr<FrontendMenuProvider> create(DevToolsHost* devtoolsHost, const Vector<ContextMenuItem>& items)
+    static PassRefPtrWillBeRawPtr<FrontendMenuProvider> create(DevToolsHost* devtoolsHost, ScriptValue devtoolsApiObject, const Vector<ContextMenuItem>& items)
     {
-        return adoptRefWillBeNoop(new FrontendMenuProvider(devtoolsHost, items));
+        return adoptRefWillBeNoop(new FrontendMenuProvider(devtoolsHost, devtoolsApiObject, items));
     }
 
     ~FrontendMenuProvider() override
     {
         // Verify that this menu provider has been detached.
         ASSERT(!m_devtoolsHost);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_devtoolsHost);
         ContextMenuProvider::trace(visitor);
     }
 
     void disconnect()
     {
+        m_devtoolsApiObject = ScriptValue();
         m_devtoolsHost = nullptr;
     }
 
     void contextMenuCleared() override
     {
         if (m_devtoolsHost) {
-            m_devtoolsHost->evaluateScript("DevToolsAPI.contextMenuCleared()");
+            if (!ScriptForbiddenScope::isScriptForbidden()) {
+                ScriptFunctionCall function(m_devtoolsApiObject, "contextMenuCleared");
+                function.call();
+            }
             m_devtoolsHost->clearMenuProvider();
             m_devtoolsHost = nullptr;
         }
         m_items.clear();
     }
 
     void populateContextMenu(ContextMenu* menu) override
     {
         for (size_t i = 0; i < m_items.size(); ++i)
             menu->appendItem(m_items[i]);
     }
 
     void contextMenuItemSelected(const ContextMenuItem* item) override
     {
         if (!m_devtoolsHost)
             return;
+
+        UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
         int itemNumber = item->action() - ContextMenuItemBaseCustomTag;
-        m_devtoolsHost->evaluateScript("DevToolsAPI.contextMenuItemSelected(" + String::number(itemNumber) + ")");
+
+        if (!ScriptForbiddenScope::isScriptForbidden()) {
+            ScriptFunctionCall function(m_devtoolsApiObject, "contextMenuItemSelected");
+            function.appendArgument(itemNumber);
+            function.call();
+        }
     }
 
 private:
-    FrontendMenuProvider(DevToolsHost* devtoolsHost, const Vector<ContextMenuItem>& items)
+    FrontendMenuProvider(DevToolsHost* devtoolsHost, ScriptValue devtoolsApiObject, const Vector<ContextMenuItem>& items)
         : m_devtoolsHost(devtoolsHost)
+        , m_devtoolsApiObject(devtoolsApiObject)
         , m_items(items)
     {
     }
 
     RawPtrWillBeMember<DevToolsHost> m_devtoolsHost;
+    ScriptValue m_devtoolsApiObject;
+
     Vector<ContextMenuItem> m_items;
 };
 
 DevToolsHost::DevToolsHost(InspectorFrontendClient* client, LocalFrame* frontendFrame)
     : m_client(client)
     , m_frontendFrame(frontendFrame)
     , m_menuProvider(nullptr)
 {
 }
 
 DevToolsHost::~DevToolsHost()
 {
     ASSERT(!m_client);
 }
 
 DEFINE_TRACE(DevToolsHost)
 {
     visitor->trace(m_frontendFrame);
     visitor->trace(m_menuProvider);
 }
 
-void DevToolsHost::evaluateScript(const String& expression)
-{
-    if (!m_frontendFrame)
-        return;
-    ScriptState* scriptState = ScriptState::forMainWorld(m_frontendFrame);
-    if (!scriptState)
-        return;
-    ScriptState::Scope scope(scriptState);
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    v8::Local<v8::String> source = v8AtomicString(scriptState->isolate(), expression.utf8().data());
-    V8ScriptRunner::compileAndRunInternalScript(source, scriptState->isolate(), String(), TextPosition());
-}
-
 void DevToolsHost::disconnectClient()
 {
     m_client = 0;
     if (m_menuProvider) {
         m_menuProvider->disconnect();
         m_menuProvider = nullptr;
     }
     m_frontendFrame = nullptr;
 }
 
@@ skipping 49 matching lines @@
 
 void DevToolsHost::sendMessageToEmbedder(const String& message)
 {
     if (m_client)
         m_client->sendMessageToEmbedder(escapeUnicodeNonCharacters(message));
 }
 
 void DevToolsHost::showContextMenu(LocalFrame* targetFrame, float x, float y, const Vector<ContextMenuItem>& items)
 {
     ASSERT(m_frontendFrame);
-    RefPtrWillBeRawPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, items);
+    ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendFrame);
+    if (!frontendScriptState)
+        return;
+    ScriptValue devtoolsApiObject = frontendScriptState->getFromGlobalObject("DevToolsAPI");
+    ASSERT(devtoolsApiObject.isObject());
+
+    RefPtrWillBeRawPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, devtoolsApiObject, items);
     m_menuProvider = menuProvider.get();
     float zoom = targetFrame->pageZoomFactor();
     if (m_client)
         m_client->showContextMenu(targetFrame, x * zoom, y * zoom, menuProvider);
 }
 
 String DevToolsHost::getSelectionBackgroundColor()
 {
     return LayoutTheme::theme().activeSelectionBackgroundColor().serialized();
 }
 
 String DevToolsHost::getSelectionForegroundColor()
 {
     return LayoutTheme::theme().activeSelectionForegroundColor().serialized();
 }
 
 bool DevToolsHost::isUnderTest()
 {
     return m_client && m_client->isUnderTest();
 }
 
 bool DevToolsHost::isHostedMode()
 {
     return false;
 }
 
 } // namespace blink