[DevTools] Move callFunctionOn to native

third_party/WebKit/Source/platform/v8_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 58 matching lines @@
     , m_native(injectedScriptNative)
     , m_contextId(contextId)
 {
     m_context.SetWeak(this, &weakCallback, v8::WeakCallbackType::kParameter);
 }
 
 InjectedScript::~InjectedScript()
 {
 }
 
-void InjectedScript::callFunctionOn(ErrorString* errorString, const String16& objectId, const String16& expression, const String16& arguments, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown)
-{
-    v8::HandleScope handles(m_isolate);
-    V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "callFunctionOn");
-    function.appendArgument(objectId);
-    function.appendArgument(expression);
-    function.appendArgument(arguments);
-    function.appendArgument(returnByValue);
-    function.appendArgument(generatePreview);
-    *result = makeEvalCall(errorString, function, wasThrown);
-}
-
 void InjectedScript::getFunctionDetails(ErrorString* errorString, const String16& functionId, OwnPtr<FunctionDetails>* result)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "getFunctionDetails");
     function.appendArgument(functionId);
     OwnPtr<protocol::Value> resultValue = makeCall(function);
     protocol::ErrorSupport errors(errorString);
     *result = FunctionDetails::parse(resultValue.get(), &errors);
 }
 
@@ skipping 214 matching lines @@
     if (!hadException) {
         result = toProtocolValue(function.context(), resultValue);
         if (!result)
             result = protocol::StringValue::create("Object has too long reference chain");
     } else {
         result = protocol::StringValue::create("Exception while making a call.");
     }
     return result.release();
 }
 
-PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::makeEvalCall(ErrorString* errorString, V8FunctionCall& function, Maybe<bool>* wasThrown)
-{
-    OwnPtr<protocol::Value> result = makeCall(function);
-    if (!result) {
-        *errorString = "Internal error: result value is empty";
-        return nullptr;
-    }
-    if (result->type() == protocol::Value::TypeString) {
-        result->asString(errorString);
-        ASSERT(errorString->length());
-        return nullptr;
-    }
-    protocol::DictionaryValue* resultPair = protocol::DictionaryValue::cast(result.get());
-    if (!resultPair) {
-        *errorString = "Internal error: result is not an Object";
-        return nullptr;
-    }
-    protocol::DictionaryValue* resultObj = resultPair->getObject("result");
-    bool wasThrownVal = false;
-    if (!resultObj || !resultPair->getBoolean("wasThrown", &wasThrownVal)) {
-        *errorString = "Internal error: result is not a pair of value and wasThrown flag";
-        return nullptr;
-    }
-    protocol::ErrorSupport errors(errorString);
-    *wasThrown = wasThrownVal;
-    return protocol::Runtime::RemoteObject::parse(resultObj, &errors);
-}
-
 PassOwnPtr<protocol::Value> InjectedScript::makeCallWithExceptionDetails(V8FunctionCall& function, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
     OwnPtr<protocol::Value> result;
     v8::HandleScope handles(m_isolate);
     v8::Context::Scope scope(context());
     v8::TryCatch tryCatch(m_isolate);
     v8::Local<v8::Value> resultValue = function.callWithoutExceptionHandling();
     if (tryCatch.HasCaught()) {
         v8::Local<v8::Message> message = tryCatch.Message();
         String16 text = !message.IsEmpty() ? toProtocolStringWithTypeCheck(message->Get()) : "Internal error";
@@ skipping 48 matching lines @@
             *errorString = "Couldn't parse value object in call argument";
             return v8::MaybeLocal<v8::Value>();
         }
         return object;
     }
     return v8::Undefined(m_isolate);
 }
 
 v8::MaybeLocal<v8::Object> InjectedScript::commandLineAPI(ErrorString* errorString)
 {
-    V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "commandLineAPI");
+    return callFunctionWithoutArguments(errorString, "commandLineAPI");
+}
+
+v8::MaybeLocal<v8::Object> InjectedScript::remoteObjectAPI(ErrorString* errorString)
+{
+    return callFunctionWithoutArguments(errorString, "remoteObjectAPI");
+}
+
+v8::MaybeLocal<v8::Object> InjectedScript::callFunctionWithoutArguments(ErrorString* errorString, const String16& name)
+{
+    V8FunctionCall function(m_manager->debugger(), context(), v8Value(), name);
     bool hadException = false;
     v8::Local<v8::Value> scopeExtensionValue = function.call(hadException, false);
     v8::Local<v8::Object> scopeExtensionObject;
     if (hadException || scopeExtensionValue.IsEmpty() || !scopeExtensionValue->ToObject(context()).ToLocal(&scopeExtensionObject)) {
         *errorString = "Internal error";
         return v8::MaybeLocal<v8::Object>();
     }
     return scopeExtensionObject;
 }
 
@@ skipping 31 matching lines @@
             return;
         *result = remoteObject.release();
         if (wasThrown)
             *wasThrown = false;
     } else {
         v8::Local<v8::Value> exception = tryCatch.Exception();
         OwnPtr<RemoteObject> remoteObject = wrapObject(errorString, exception, objectGroup, false, generatePreview && !exception->IsNativeError());
         if (!remoteObject)
             return;
         *result = remoteObject.release();
-        *exceptionDetails = createExceptionDetails(tryCatch.Message());
+        if (exceptionDetails)
+            *exceptionDetails = createExceptionDetails(tryCatch.Message());
         if (wasThrown)
             *wasThrown = true;
     }
 }
 
 } // namespace blink