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

third_party/WebKit/Source/core/inspector/InjectedScript.h

 /*
  * 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:
  *
  *     * 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 26 matching lines @@
 #include "core/inspector/InjectedScriptNative.h"
 #include "wtf/Allocator.h"
 #include "wtf/Forward.h"
 #include <v8.h>
 
 namespace blink {
 
 class JSONValue;
 class RemoteObjectId;
 class ScriptFunctionCall;
+class V8DebuggerClient;
 
 typedef String ErrorString;
-PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
 
 class InjectedScript final {
     USING_FAST_MALLOC(InjectedScript);
 public:
-    InjectedScript();
     ~InjectedScript();
 
     ScriptState* scriptState() const
     {
         return m_injectedScriptObject.scriptState();
     }
 
     void evaluate(
         ErrorString*,
         const String& expression,
@@ skipping 43 matching lines @@
     v8::Local<v8::Value> findObject(const RemoteObjectId&) const;
 
     String objectIdToObjectGroupName(const String& objectId) const;
     void releaseObjectGroup(const String&);
 
     void setCustomObjectFormatterEnabled(bool);
     int contextId() { return m_contextId; }
 
 private:
     friend InjectedScript* InjectedScriptManager::injectedScriptFor(ScriptState*);
-    using InspectedStateAccessCheck = bool (*)(ScriptState*);
-    InjectedScript(ScriptValue, InspectedStateAccessCheck, PassRefPtr<InjectedScriptNative>, int contextId);
+    InjectedScript(ScriptValue, V8DebuggerClient*, PassRefPtr<InjectedScriptNative>, int contextId);
 
-    void initialize(ScriptValue, InspectedStateAccessCheck);
     bool canAccessInspectedWindow() const;
-    const ScriptValue& injectedScriptObject() const;
-    ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
+    v8::Local<v8::Context> v8Context() const;
+    v8::Local<v8::Value> v8Value() const;
+    v8::Local<v8::Value> callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
     void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result);
     void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* = 0);
     void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
 
+    v8::Isolate* m_isolate;
     ScriptValue m_injectedScriptObject;
-    InspectedStateAccessCheck m_inspectedStateAccessCheck;
+    V8DebuggerClient* m_client;
     RefPtr<InjectedScriptNative> m_native;
     int m_contextId;
 };
 
 } // namespace blink
 
 #endif