Merge DevTools Refactor CL to Blink36

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 29 matching lines @@
 
 using WebCore::TypeBuilder::Array;
 using WebCore::TypeBuilder::Debugger::CallFrame;
 using WebCore::TypeBuilder::Runtime::PropertyDescriptor;
 using WebCore::TypeBuilder::Runtime::InternalPropertyDescriptor;
 using WebCore::TypeBuilder::Debugger::FunctionDetails;
 using WebCore::TypeBuilder::Runtime::RemoteObject;
 
 namespace WebCore {
 
-InjectedScript::InjectedScript()
-    : InjectedScriptBase("InjectedScript")
+V8InjectedScript::V8InjectedScript()
+    : V8InjectedScriptBase("InjectedScript")
 {
 }
 
-InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
-    : InjectedScriptBase("InjectedScript", injectedScriptObject, accessCheck)
+V8InjectedScript::V8InjectedScript(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+    : V8InjectedScriptBase("InjectedScript", injectedScriptObject, accessCheck)
 {
 }
 
-void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
+void V8InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
 {
     ScriptFunctionCall function(injectedScriptObject(), "evaluate");
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
+void V8InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
 {
     ScriptFunctionCall function(injectedScriptObject(), "callFunctionOn");
     function.appendArgument(objectId);
     function.appendArgument(expression);
     function.appendArgument(arguments);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const Vector<ScriptValue>& asyncCallStacks, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
+void V8InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const StackTrace& callFrames, const Vector<StackTrace>& asyncCallStacks, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
 {
     ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
-    function.appendArgument(callFrames);
-    function.appendArgument(asyncCallStacks);
+    function.appendArgument(callFrames.asJavaScript());
+    Vector<ScriptValue> asyncCallStacksJavaScript;
+    for (size_t i = 0; i < asyncCallStacks.size(); i++) {
+        if (asyncCallStacks[i].isJavaScript())
+            asyncCallStacksJavaScript.append(asyncCallStacks[i].asJavaScript());
+    }
+    function.appendArgument(asyncCallStacksJavaScript);
     function.appendArgument(callFrameId);
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-void InjectedScript::restartFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, RefPtr<JSONObject>* result)
+void V8InjectedScript::getCompletionsOnCallFrame(ErrorString* errorString, const StackTrace& callFrames, const Vector<StackTrace>& asyncCallStacks, const String& callFrameId, const String& expression, RefPtr<TypeBuilder::Array<String> >* result)
+{
+    ScriptFunctionCall function(injectedScriptObject(), "getCompletionsOnCallFrame");
+    function.appendArgument(callFrames.asJavaScript());
+    Vector<ScriptValue> asyncCallStacksJavaScript;
+    for (size_t i = 0; i < asyncCallStacks.size(); i++) {
+        if (asyncCallStacks[i].isJavaScript())
+            asyncCallStacksJavaScript.append(asyncCallStacks[i].asJavaScript());
+    }
+    function.appendArgument(asyncCallStacksJavaScript);
+    function.appendArgument(callFrameId);
+    function.appendArgument(expression);
+    RefPtr<JSONValue> resultValue;
+    makeCall(function, &resultValue);
+    if (!resultValue || resultValue->type() != JSONValue::TypeArray) {
+        *errorString = "Internal error";
+        return;
+    }
+    *result = Array<String>::runtimeCast(resultValue);
+}
+
+void V8InjectedScript::restartFrame(ErrorString* errorString, const StackTrace& callFrames, const String& callFrameId, RefPtr<JSONObject>* result)
 {
     ScriptFunctionCall function(injectedScriptObject(), "restartFrame");
-    function.appendArgument(callFrames);
+    function.appendArgument(callFrames.asJavaScript());
     function.appendArgument(callFrameId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (resultValue) {
         if (resultValue->type() == JSONValue::TypeString) {
             resultValue->asString(errorString);
             return;
         }
         if (resultValue->type() == JSONValue::TypeObject) {
             *result = resultValue->asObject();
             return;
         }
     }
     *errorString = "Internal error";
 }
 
-void InjectedScript::getStepInPositions(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, RefPtr<Array<TypeBuilder::Debugger::Location> >& positions)
+void V8InjectedScript::getStepInPositions(ErrorString* errorString, const StackTrace& callFrames, const String& callFrameId, RefPtr<Array<TypeBuilder::Debugger::Location> >& positions)
 {
     ScriptFunctionCall function(injectedScriptObject(), "getStepInPositions");
-    function.appendArgument(callFrames);
+    function.appendArgument(callFrames.asJavaScript());
     function.appendArgument(callFrameId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (resultValue) {
         if (resultValue->type() == JSONValue::TypeString) {
             resultValue->asString(errorString);
             return;
         }
         if (resultValue->type() == JSONValue::TypeArray) {
             positions = Array<TypeBuilder::Debugger::Location>::runtimeCast(resultValue);
             return;
         }
     }
     *errorString = "Internal error";
 }
 
-void InjectedScript::setVariableValue(ErrorString* errorString, const ScriptValue& callFrames, const String* callFrameIdOpt, const String* functionObjectIdOpt, int scopeNumber, const String& variableName, const String& newValueStr)
+void V8InjectedScript::setVariableValue(ErrorString* errorString, const StackTrace& callFrames, const String* callFrameIdOpt, const String* functionObjectIdOpt, int scopeNumber, const String& variableName, const String& newValueStr)
 {
     ScriptFunctionCall function(injectedScriptObject(), "setVariableValue");
     if (callFrameIdOpt) {
-        function.appendArgument(callFrames);
+        function.appendArgument(callFrames.asJavaScript());
         function.appendArgument(*callFrameIdOpt);
     } else {
         function.appendArgument(false);
         function.appendArgument(false);
     }
     if (functionObjectIdOpt)
         function.appendArgument(*functionObjectIdOpt);
     else
         function.appendArgument(false);
     function.appendArgument(scopeNumber);
     function.appendArgument(variableName);
     function.appendArgument(newValueStr);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue) {
         *errorString = "Internal error";
         return;
     }
     if (resultValue->type() == JSONValue::TypeString) {
         resultValue->asString(errorString);
         return;
     }
     // Normal return.
 }
 
-void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
+void V8InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
 {
     ScriptFunctionCall function(injectedScriptObject(), "getFunctionDetails");
     function.appendArgument(functionId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error";
         return;
     }
     *result = FunctionDetails::runtimeCast(resultValue);
 }
 
-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, RefPtr<Array<PropertyDescriptor> >* properties)
+void V8InjectedScript::getCompletions(ErrorString* errorString, const String& expression, RefPtr<TypeBuilder::Array<String> >* result)
+{
+    *result = TypeBuilder::Array<String>::create();
+    ScriptFunctionCall function(injectedScriptObject(), "getCompletions");
+    function.appendArgument(expression);
+    RefPtr<JSONValue> resultValue;
+    makeCall(function, &resultValue);
+    if (!resultValue || resultValue->type() != JSONValue::TypeArray) {
+        *errorString = "Internal error";
+        return;
+    }
+    *result = Array<String>::runtimeCast(resultValue);
+}
+
+void V8InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, RefPtr<Array<PropertyDescriptor> >* properties)
 {
     ScriptFunctionCall function(injectedScriptObject(), "getProperties");
     function.appendArgument(objectId);
     function.appendArgument(ownProperties);
     function.appendArgument(accessorPropertiesOnly);
 
     RefPtr<JSONValue> result;
     makeCall(function, &result);
     if (!result || result->type() != JSONValue::TypeArray) {
         *errorString = "Internal error";
         return;
     }
     *properties = Array<PropertyDescriptor>::runtimeCast(result);
 }
 
-void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<InternalPropertyDescriptor> >* properties)
+void V8InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<InternalPropertyDescriptor> >* properties)
 {
     ScriptFunctionCall function(injectedScriptObject(), "getInternalProperties");
     function.appendArgument(objectId);
 
     RefPtr<JSONValue> result;
     makeCall(function, &result);
     if (!result || result->type() != JSONValue::TypeArray) {
         *errorString = "Internal error";
         return;
     }
     RefPtr<Array<InternalPropertyDescriptor> > array = Array<InternalPropertyDescriptor>::runtimeCast(result);
     if (array->length() > 0)
         *properties = array;
 }
 
-Node* InjectedScript::nodeForObjectId(const String& objectId)
+void V8InjectedScript::getProperty(ErrorString* errorString, const String& objectId, const RefPtr<JSONArray>& propertyPath, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
+{
+    ScriptFunctionCall function(injectedScriptObject(), "getProperty");
+    function.appendArgument(objectId);
+    function.appendArgument(propertyPath);
+    makeEvalCall(errorString, function, result, wasThrown);
+}
+
+Node* V8InjectedScript::nodeForObjectId(const String& objectId)
 {
     if (isEmpty() || !canAccessInspectedWindow())
         return 0;
 
     ScriptFunctionCall function(injectedScriptObject(), "nodeForObjectId");
     function.appendArgument(objectId);
 
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
 
     return InjectedScriptHost::scriptValueAsNode(resultValue);
 }
 
-void InjectedScript::releaseObject(const String& objectId)
+void V8InjectedScript::releaseObject(const String& objectId)
 {
     ScriptFunctionCall function(injectedScriptObject(), "releaseObject");
     function.appendArgument(objectId);
     RefPtr<JSONValue> result;
     makeCall(function, &result);
 }
 
-PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& callFrames, int asyncOrdinal)
+PassRefPtr<Array<CallFrame> > V8InjectedScript::wrapCallFrames(const StackTrace& callFrames, int asyncOrdinal)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
-    function.appendArgument(callFrames);
+    function.appendArgument(callFrames.asJavaScript());
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
     ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     RefPtr<JSONValue> result = callFramesValue.toJSONValue(scriptState());
     if (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> V8InjectedScript::wrapObject(const ScriptValue& value, const String& groupName, bool generatePreview)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
     wrapFunction.appendArgument(value);
     wrapFunction.appendArgument(groupName);
     wrapFunction.appendArgument(canAccessInspectedWindow());
     wrapFunction.appendArgument(generatePreview);
     bool hadException = false;
     ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = r.toJSONValue(scriptState())->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
-PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const ScriptValue& table, const ScriptValue& columns) const
+PassRefPtr<TypeBuilder::Runtime::RemoteObject> V8InjectedScript::wrapTable(const ScriptValue& table, const ScriptValue& columns)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapTable");
     wrapFunction.appendArgument(canAccessInspectedWindow());
     wrapFunction.appendArgument(table);
     if (columns.isEmpty())
         wrapFunction.appendArgument(false);
     else
         wrapFunction.appendArgument(columns);
     bool hadException = false;
     ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = r.toJSONValue(scriptState())->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
-PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapNode(Node* node, const String& groupName)
+PassRefPtr<TypeBuilder::Runtime::RemoteObject> V8InjectedScript::wrapNode(Node* node, const String& groupName)
 {
     return wrapObject(nodeAsScriptValue(node), groupName);
 }
 
-ScriptValue InjectedScript::findObjectById(const String& objectId) const
+ScriptValue V8InjectedScript::findObjectById(const String& objectId) const
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "findObjectById");
     function.appendArgument(objectId);
 
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     return resultValue;
 }
 
-ScriptValue InjectedScript::findCallFrameById(ErrorString* errorString, const ScriptValue& topCallFrame, const String& callFrameId)
+ActivationFrame V8InjectedScript::findCallFrameById(ErrorString* errorString, const StackTrace& topCallFrame, const String& callFrameId)
 {
+    ASSERT(topCallFrame.isJavaScript());
     ScriptFunctionCall function(injectedScriptObject(), "callFrameForId");
-    function.appendArgument(topCallFrame);
+    function.appendArgument(topCallFrame.asJavaScript());
     function.appendArgument(callFrameId);
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     if (hadException || resultValue.isEmpty() || !resultValue.isObject()) {
         *errorString = "Internal error";
-        return ScriptValue();
+        return ActivationFrame();
     }
-    return resultValue;
+    return ActivationFrame(resultValue);
 }
 
-void InjectedScript::inspectNode(Node* node)
+void V8InjectedScript::inspectNode(Node* node)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "inspectNode");
     function.appendArgument(nodeAsScriptValue(node));
     RefPtr<JSONValue> result;
     makeCall(function, &result);
 }
 
-void InjectedScript::releaseObjectGroup(const String& objectGroup)
+void V8InjectedScript::releaseObjectGroup(const String& objectGroup)
 {
     ASSERT(!isEmpty());
     ScriptFunctionCall releaseFunction(injectedScriptObject(), "releaseObjectGroup");
     releaseFunction.appendArgument(objectGroup);
     bool hadException = false;
     callFunctionWithEvalEnabled(releaseFunction, hadException);
     ASSERT(!hadException);
 }
 
-ScriptValue InjectedScript::nodeAsScriptValue(Node* node)
+ScriptValue V8InjectedScript::nodeAsScriptValue(Node* node)
 {
     return InjectedScriptHost::nodeAsScriptValue(scriptState(), node);
 }
 
 } // namespace WebCore