DevTools: migrate injectedscript from ScriptValue to v8::Global.

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

Index: third_party/WebKit/Source/core/inspector/InjectedScript.h
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScript.h b/third_party/WebKit/Source/core/inspector/InjectedScript.h
index b432ff1f6850640ef46668324d86a436c1bc3a31..9ecdd6159e2f20cf5ed9c1e2f720d8a4be95c4bc 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScript.h
+++ b/third_party/WebKit/Source/core/inspector/InjectedScript.h
@@ -31,7 +31,6 @@
 #ifndef InjectedScript_h
 #define InjectedScript_h
 
-#include "bindings/core/v8/ScriptValue.h"
 #include "core/InspectorTypeBuilder.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InjectedScriptNative.h"
@@ -41,6 +40,7 @@
 
 namespace blink {
 
+class InjectedScriptManager;
 class JSONValue;
 class RemoteObjectId;
 class ScriptFunctionCall;
@@ -53,11 +53,6 @@ class InjectedScript final {
 public:
     ~InjectedScript();
 
-    ScriptState* scriptState() const
-    {
-        return m_injectedScriptObject.scriptState();
-    }
-
     void evaluate(
         ErrorString*,
         const String& expression,
@@ -112,20 +107,25 @@ public:
     void setCustomObjectFormatterEnabled(bool);
     int contextId() { return m_contextId; }
 
+    v8::Isolate* isolate() { return m_isolate; }
+    v8::Local<v8::Context> context() const;
+    void dispose();
+
 private:
     friend InjectedScript* InjectedScriptManager::injectedScriptFor(v8::Local<v8::Context>);
-    InjectedScript(v8::Local<v8::Object>, V8DebuggerClient*, PassRefPtr<InjectedScriptNative>, int contextId);
+    InjectedScript(InjectedScriptManager*, v8::Local<v8::Context>, v8::Local<v8::Object>, V8DebuggerClient*, PassRefPtr<InjectedScriptNative>, int contextId);
 
     bool canAccessInspectedWindow() 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>*);
 
+    InjectedScriptManager* m_manager;
     v8::Isolate* m_isolate;
-    ScriptValue m_injectedScriptObject;
+    v8::Global<v8::Context> m_context;
+    v8::Global<v8::Value> m_value;
     V8DebuggerClient* m_client;
     RefPtr<InjectedScriptNative> m_native;
     int m_contextId;