DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp).

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 18 matching lines @@
  */
 
 #include "core/inspector/InjectedScriptManager.h"
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptNative.h"
 #include "core/inspector/RemoteObjectId.h"
 #include "core/inspector/v8/V8Debugger.h"
+#include "core/inspector/v8/V8DebuggerClient.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
-PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
+PassOwnPtr<InjectedScriptManager> InjectedScriptManager::create(V8DebuggerClient* client)
 {
-    return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWindow));
+    return adoptPtr(new InjectedScriptManager(client));
 }
 
-PassOwnPtr<InjectedScriptManager> InjectedScriptManager::createForWorker()
-{
-    return adoptPtr(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWorkerGlobalScope));
-}
-
-InjectedScriptManager::InjectedScriptManager(InspectedStateAccessCheck accessCheck)
+InjectedScriptManager::InjectedScriptManager(V8DebuggerClient* client)
     : m_injectedScriptHost(InjectedScriptHost::create())
-    , m_inspectedStateAccessCheck(accessCheck)
     , m_customObjectFormatterEnabled(false)
+    , m_client(client)
 {
 }
 
 InjectedScriptManager::~InjectedScriptManager()
 {
 }
 
 void InjectedScriptManager::disconnect()
 {
     m_injectedScriptHost->disconnect();
@@ skipping 24 matching lines @@
 }
 
 int InjectedScriptManager::discardInjectedScriptFor(ScriptState* scriptState)
 {
     ScriptState::Scope scope(scriptState);
     int contextId = V8Debugger::contextId(scriptState->context());
     m_idToInjectedScript.remove(contextId);
     return contextId;
 }
 
-bool InjectedScriptManager::canAccessInspectedWorkerGlobalScope(ScriptState*)
-{
-    return true;
-}
-
 void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)
 {
     Vector<int> keys;
     keys.appendRange(m_idToInjectedScript.keys().begin(), m_idToInjectedScript.keys().end());
     for (auto& key : keys) {
         IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(key);
         if (s != m_idToInjectedScript.end())
             s->value->releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
     }
 }
@@ skipping 15 matching lines @@
 
 InjectedScript* InjectedScriptManager::injectedScriptFor(ScriptState* scriptState)
 {
     ScriptState::Scope scope(scriptState);
     int contextId = V8Debugger::contextId(scriptState->context());
 
     IdToInjectedScriptMap::iterator it = m_idToInjectedScript.find(contextId);
     if (it != m_idToInjectedScript.end())
         return it->value.get();
 
-    if (!m_inspectedStateAccessCheck(scriptState))
+    if (!m_client->canAccessContext(scriptState->context()))
         return nullptr;
 
     RefPtr<InjectedScriptNative> injectedScriptNative = adoptRef(new InjectedScriptNative(scriptState->isolate()));
     ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), scriptState, contextId, injectedScriptNative.get());
-    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(injectedScriptValue, m_inspectedStateAccessCheck, injectedScriptNative.release(), contextId));
+    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(injectedScriptValue, m_client, injectedScriptNative.release(), contextId));
     InjectedScript* resultPtr = result.get();
     if (m_customObjectFormatterEnabled)
         result->setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
     m_idToInjectedScript.set(contextId, result.release());
     return resultPtr;
 }
 
 } // namespace blink