[DevTools] Move evaluate from InjectedScriptSource.js 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 38 matching lines @@
 using blink::protocol::Debugger::CollectionEntry;
 using blink::protocol::Debugger::FunctionDetails;
 using blink::protocol::Debugger::GeneratorObjectDetails;
 using blink::protocol::Runtime::PropertyDescriptor;
 using blink::protocol::Runtime::InternalPropertyDescriptor;
 using blink::protocol::Runtime::RemoteObject;
 using blink::protocol::Maybe;
 
 namespace blink {
 
-static PassOwnPtr<protocol::Runtime::ExceptionDetails> toExceptionDetails(protocol::DictionaryValue* object)
-{
-    String16 text;
-    if (!object->getString("text", &text))
-        return nullptr;
-
-    OwnPtr<protocol::Runtime::ExceptionDetails> exceptionDetails = protocol::Runtime::ExceptionDetails::create().setText(text).build();
-    String16 url;
-    if (object->getString("url", &url))
-        exceptionDetails->setUrl(url);
-    int line = 0;
-    if (object->getNumber("line", &line))
-        exceptionDetails->setLine(line);
-    int column = 0;
-    if (object->getNumber("column", &column))
-        exceptionDetails->setColumn(column);
-    int originScriptId = 0;
-    object->getNumber("scriptId", &originScriptId);
-
-    protocol::ListValue* stackTrace = object->getArray("stackTrace");
-    if (stackTrace && stackTrace->size() > 0) {
-        OwnPtr<protocol::Array<protocol::Runtime::CallFrame>> frames = protocol::Array<protocol::Runtime::CallFrame>::create();
-        for (unsigned i = 0; i < stackTrace->size(); ++i) {
-            protocol::DictionaryValue* stackFrame = protocol::DictionaryValue::cast(stackTrace->at(i));
-            int lineNumber = 0;
-            stackFrame->getNumber("lineNumber", &lineNumber);
-            int column = 0;
-            stackFrame->getNumber("column", &column);
-            int scriptId = 0;
-            stackFrame->getNumber("scriptId", &scriptId);
-            if (i == 0 && scriptId == originScriptId)
-                originScriptId = 0;
-
-            String16 sourceURL;
-            stackFrame->getString("scriptNameOrSourceURL", &sourceURL);
-            String16 functionName;
-            stackFrame->getString("functionName", &functionName);
-
-            OwnPtr<protocol::Runtime::CallFrame> callFrame = protocol::Runtime::CallFrame::create()
-                .setFunctionName(functionName)
-                .setScriptId(String16::number(scriptId))
-                .setUrl(sourceURL)
-                .setLineNumber(lineNumber)
-                .setColumnNumber(column).build();
-
-            frames->addItem(callFrame.release());
-        }
-        OwnPtr<protocol::Runtime::StackTrace> stack = protocol::Runtime::StackTrace::create()
-            .setCallFrames(frames.release()).build();
-        exceptionDetails->setStack(stack.release());
-    }
-    if (originScriptId)
-        exceptionDetails->setScriptId(String16::number(originScriptId));
-    return exceptionDetails.release();
-}
-
 static void weakCallback(const v8::WeakCallbackInfo<InjectedScript>& data)
 {
     data.GetParameter()->dispose();
 }
 
 InjectedScript::InjectedScript(InjectedScriptManager* manager, v8::Local<v8::Context> context, v8::Local<v8::Object> object, PassOwnPtr<InjectedScriptNative> injectedScriptNative, int contextId)
     : m_manager(manager)
     , m_isolate(context->GetIsolate())
     , m_context(m_isolate, context)
     , m_value(m_isolate, object)
     , m_native(injectedScriptNative)
     , m_contextId(contextId)
 {
     m_context.SetWeak(this, &weakCallback, v8::WeakCallbackType::kParameter);
 }
 
 InjectedScript::~InjectedScript()
 {
 }
 
-void InjectedScript::evaluate(ErrorString* errorString, const String16& expression, const String16& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
-{
-    v8::HandleScope handles(m_isolate);
-    V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "evaluate");
-    function.appendArgument(expression);
-    function.appendArgument(objectGroup);
-    function.appendArgument(includeCommandLineAPI);
-    function.appendArgument(returnByValue);
-    function.appendArgument(generatePreview);
-    *result = makeEvalCall(errorString, function, wasThrown, exceptionDetails);
-}
-
 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);
@@ skipping 226 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, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
+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;
     }
-    if (wasThrownVal) {
-        protocol::DictionaryValue* objectExceptionDetails = resultPair->getObject("exceptionDetails");
-        if (objectExceptionDetails)
-            *exceptionDetails = toExceptionDetails(objectExceptionDetails);
-    }
     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());
@@ skipping 97 matching lines @@
         if (!maybeResultValue.ToLocal(&resultValue)) {
             *errorString = "Internal error";
             return;
         }
         OwnPtr<RemoteObject> remoteObject = wrapObject(errorString, resultValue, objectGroup, returnByValue, generatePreview);
         if (!remoteObject)
             return;
         if (objectGroup == "console" && !setLastEvaluationResult(errorString, resultValue))
             return;
         *result = remoteObject.release();
-        *wasThrown = false;
+        if (wasThrown)

[dgozman, 2016/03/18 00:04:33]

Should we kill this entirely and just set this bool on the upper level?

[kozy, 2016/03/18 00:41:38]

There is call sides that has wasThrown and doesn't have exceptionDetails.

+            *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());
-        *wasThrown = true;
+        if (wasThrown)
+            *wasThrown = true;
     }
 }
 
 } // namespace blink