DevTools: remove ScriptState/Value from the InjectedScript APIs.

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

 /*
  * 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 88 matching lines @@
 
             frames->addItem(callFrame.release());
         }
         exceptionDetails->setStackTrace(frames.release());
     }
     if (originScriptId)
         exceptionDetails->setScriptId(String::number(originScriptId));
     return exceptionDetails.release();
 }
 
-InjectedScript::InjectedScript(ScriptValue injectedScriptObject, V8DebuggerClient* client, PassRefPtr<InjectedScriptNative> injectedScriptNative, int contextId)
-    : m_isolate(injectedScriptObject.isolate())
-    , m_injectedScriptObject(injectedScriptObject)
+InjectedScript::InjectedScript(v8::Local<v8::Object> injectedScriptObject, V8DebuggerClient* client, PassRefPtr<InjectedScriptNative> injectedScriptNative, int contextId)
+    : m_isolate(injectedScriptObject->CreationContext()->GetIsolate())
+    , m_injectedScriptObject(ScriptValue(ScriptState::from(injectedScriptObject->CreationContext()), injectedScriptObject))
     , m_client(client)
     , m_native(injectedScriptNative)
     , m_contextId(contextId)
 {
 }
 
 InjectedScript::~InjectedScript()
 {
 }
 
@@ skipping 218 matching lines @@
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
     v8::Local<v8::Value> callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     RefPtr<JSONValue> result = toJSONValue(context, callFramesValue);
     if (result && result->type() == JSONValue::TypeArray)
         return Array<CallFrame>::runtimeCast(result);
     return Array<CallFrame>::create();
 }
 
-PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const ScriptValue& value, const String& groupName, bool generatePreview) const
+PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(v8::Local<v8::Value> value, const String& groupName, bool generatePreview) const
 {
     ScriptState::Scope scope(m_injectedScriptObject.scriptState());
     v8::Local<v8::Context> context = v8Context();
     ScriptFunctionCall function(m_client, context, v8Value(), "wrapObject");
-    function.appendArgument(value.v8Value());
+    function.appendArgument(value);
     function.appendArgument(groupName);
     function.appendArgument(canAccessInspectedWindow());
     function.appendArgument(generatePreview);
     bool hadException = false;
     v8::Local<v8::Value> r = callFunctionWithEvalEnabled(function, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = toJSONValue(context, r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
-PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const ScriptValue& table, const ScriptValue& columns) const
+PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(v8::Local<v8::Value> table, v8::Local<v8::Value> columns) const
 {
     ScriptState::Scope scope(m_injectedScriptObject.scriptState());
     v8::Local<v8::Context> context = v8Context();
     ScriptFunctionCall function(m_client, context, v8Value(), "wrapTable");
     function.appendArgument(canAccessInspectedWindow());
-    function.appendArgument(table.v8Value());
-    if (columns.isEmpty())
+    function.appendArgument(table);
+    if (columns.IsEmpty())
         function.appendArgument(false);
     else
-        function.appendArgument(columns.v8Value());
+        function.appendArgument(columns);
     bool hadException = false;
     v8::Local<v8::Value>  r = callFunctionWithEvalEnabled(function, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = toJSONValue(context, r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
 v8::Local<v8::Value> InjectedScript::findObject(const RemoteObjectId& objectId) const
 {
@@ skipping 31 matching lines @@
     ScriptState::Scope scope(m_injectedScriptObject.scriptState());
     ScriptFunctionCall function(m_client, v8Context(), v8Value(), "setCustomObjectFormatterEnabled");
     function.appendArgument(enabled);
     RefPtr<JSONValue> result;
     makeCall(function, &result);
 }
 
 bool InjectedScript::canAccessInspectedWindow() const
 {
     ScriptState* scriptState = m_injectedScriptObject.scriptState();
-    return scriptState && m_client->canAccessContext(scriptState->context());
+    return scriptState && m_client->callingContextCanAccessContext(scriptState->context());
 }
 
 v8::Local<v8::Context> InjectedScript::v8Context() const
 {
     return m_injectedScriptObject.context();
 }
 
 v8::Local<v8::Value> InjectedScript::v8Value() const
 {
     return m_injectedScriptObject.v8Value();
@@ skipping 75 matching lines @@
         String text = !message.IsEmpty() ? toCoreStringWithUndefinedOrNullCheck(message->Get()) : "Internal error";
         *exceptionDetails = TypeBuilder::Debugger::ExceptionDetails::create().setText(text);
     } else {
         *result = toJSONValue(function.context(), resultValue);
         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     }
 }
 
 } // namespace blink