[DevTools] Move evaluateOnCallFrame to native

third_party/WebKit/Source/platform/v8_inspector/V8RuntimeAgentImpl.cpp

 /*
  * Copyright (C) 2011 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 32 matching lines @@
 
 namespace blink {
 
 namespace V8RuntimeAgentImplState {
 static const char customObjectFormatterEnabled[] = "customObjectFormatterEnabled";
 };
 
 using protocol::Runtime::ExceptionDetails;
 using protocol::Runtime::RemoteObject;
 
+static PassOwnPtr<ExceptionDetails> createExceptionDetails(V8Debugger* debugger, v8::Local<v8::Context> context, v8::Local<v8::Message> message)
+{
+    OwnPtr<protocol::Runtime::ExceptionDetails> exceptionDetailsObject = protocol::Runtime::ExceptionDetails::create().setText(toProtocolString(message->Get())).build();
+    exceptionDetailsObject->setUrl(toProtocolStringWithTypeCheck(message->GetScriptResourceName()));
+    exceptionDetailsObject->setScriptId(String16::number(message->GetScriptOrigin().ScriptID()->Value()));
+
+    v8::Maybe<int> lineNumber = message->GetLineNumber(context);
+    if (lineNumber.IsJust())
+        exceptionDetailsObject->setLine(lineNumber.FromJust());
+    v8::Maybe<int> columnNumber = message->GetStartColumn(context);
+    if (columnNumber.IsJust())
+        exceptionDetailsObject->setColumn(columnNumber.FromJust());
+
+    v8::Local<v8::StackTrace> stackTrace = message->GetStackTrace();
+    if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
+        exceptionDetailsObject->setStack(debugger->createStackTrace(stackTrace, stackTrace->GetFrameCount())->buildInspectorObject());
+    return exceptionDetailsObject.release();
+}
+
 PassOwnPtr<V8RuntimeAgent> V8RuntimeAgent::create(V8Debugger* debugger, int contextGroupId)
 {
     return adoptPtr(new V8RuntimeAgentImpl(static_cast<V8DebuggerImpl*>(debugger), contextGroupId));
 }
 
 V8RuntimeAgentImpl::V8RuntimeAgentImpl(V8DebuggerImpl* debugger, int contextGroupId)
     : m_contextGroupId(contextGroupId)
     , m_state(nullptr)
     , m_frontend(nullptr)
     , m_injectedScriptManager(InjectedScriptManager::create(debugger))
@@ skipping 141 matching lines @@
     }
 
     v8::Isolate* isolate = injectedScript->isolate();
     v8::HandleScope handles(isolate);
     v8::Context::Scope scope(injectedScript->context());
     v8::TryCatch tryCatch(isolate);
     v8::Local<v8::Script> script = m_debugger->compileInternalScript(injectedScript->context(), toV8String(isolate, expression), sourceURL);
     if (script.IsEmpty()) {
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
-            *exceptionDetails = createExceptionDetails(isolate, message);
+            *exceptionDetails = createExceptionDetails(m_debugger, injectedScript->context(), message);
         else
             *errorString = "Script compilation failed";
         return;
     }
 
     if (!persistScript)
         return;
 
     String16 scriptValueId = String16::number(script->GetUnboundScript()->GetId());
     OwnPtr<v8::Global<v8::Script>> global = adoptPtr(new v8::Global<v8::Script>(isolate, script));
@@ skipping 34 matching lines @@
     OwnPtr<v8::Global<v8::Script>> scriptWrapper = m_compiledScripts.take(scriptId);
     v8::Local<v8::Script> script = scriptWrapper->Get(isolate);
 
     if (script.IsEmpty()) {
         *errorString = "Script execution failed";
         return;
     }
     v8::TryCatch tryCatch(isolate);
 
     v8::Local<v8::Value> value;
-    v8::MaybeLocal<v8::Value> maybeValue = injectedScript->runCompiledScript(script, includeCommandLineAPI.fromMaybe(false));
+
+    InjectedScriptManager::InjectScopeExtensionByName scopeExtension(errorString, injectedScript, false, "commandLineAPI");
+    if (scopeExtension.hasError())
+        return;
+
+    v8::MaybeLocal<v8::Value> maybeValue = m_debugger->runCompiledScript(context, script);
     if (maybeValue.IsEmpty()) {
         value = tryCatch.Exception();
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
-            *exceptionDetails = createExceptionDetails(isolate, message);
+            *exceptionDetails = createExceptionDetails(m_debugger, injectedScript->context(), message);
     } else {
         value = maybeValue.ToLocalChecked();
     }
 
     if (value.IsEmpty()) {
         *errorString = "Script execution failed";
         return;
     }
 
-    *result = injectedScript->wrapObject(value, objectGroup.fromMaybe(""));
+    injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);

[dgozman, 2016/03/17 19:16:12]

Same comment here.

[kozy, 2016/03/17 20:48:56]

Done.

+    if (!injectedScript) {
+        *errorString = "Inspected frame has gone during script running";
+        return;
+    }
+
+    OwnPtr<RemoteObject> resultObject = injectedScript->wrapObject(errorString, value, objectGroup.fromMaybe(""));

[dgozman, 2016/03/17 19:16:12]

Just return.

[kozy, 2016/03/17 20:48:56]

Done.

+    if (!resultObject)
+        return;
+    *result = resultObject.release();
 }
 
 void V8RuntimeAgentImpl::setInspectorState(protocol::DictionaryValue* state)
 {
     m_state = state;
 }
 
 void V8RuntimeAgentImpl::setFrontend(protocol::Frontend::Runtime* frontend)
 {
     m_frontend = frontend;
@@ skipping 50 matching lines @@
 void V8RuntimeAgentImpl::setInspectObjectCallback(PassOwnPtr<V8RuntimeAgent::InspectCallback> callback)
 {
     m_injectedScriptManager->injectedScriptHost()->setInspectObjectCallback(callback);
 }
 
 PassOwnPtr<RemoteObject> V8RuntimeAgentImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& groupName, bool generatePreview)
 {
     InjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(context);
     if (!injectedScript)
         return nullptr;
-    return injectedScript->wrapObject(value, groupName, generatePreview);
+    ErrorString errorString;
+    return injectedScript->wrapObject(&errorString, value, groupName, false, generatePreview);
 }
 
 PassOwnPtr<RemoteObject> V8RuntimeAgentImpl::wrapTable(v8::Local<v8::Context> context, v8::Local<v8::Value> table, v8::Local<v8::Value> columns)
 {
     InjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(context);
     if (!injectedScript)
         return nullptr;
     return injectedScript->wrapTable(table, columns);
 }
 
@@ skipping 46 matching lines @@
 }
 
 void V8RuntimeAgentImpl::reportExecutionContextDestroyed(v8::Local<v8::Context> context)
 {
     int contextId = m_injectedScriptManager->discardInjectedScriptFor(context);
     if (!m_enabled)
         return;
     m_frontend->executionContextDestroyed(contextId);
 }
 
-PassOwnPtr<ExceptionDetails> V8RuntimeAgentImpl::createExceptionDetails(v8::Isolate* isolate, v8::Local<v8::Message> message)
+void V8RuntimeAgentImpl::wrapEvaluateResult(ErrorString* errorString, V8Debugger* debugger, InjectedScript* injectedScript, v8::Local<v8::Value> resultValue, v8::TryCatch& tryCatch, const String16& objectGroup, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
-    OwnPtr<ExceptionDetails> exceptionDetails = ExceptionDetails::create().setText(toProtocolStringWithTypeCheck(message->Get())).build();
-    exceptionDetails->setLine(message->GetLineNumber());
-    exceptionDetails->setColumn(message->GetStartColumn());
-    v8::Local<v8::StackTrace> messageStackTrace = message->GetStackTrace();
-    if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
-        exceptionDetails->setStack(m_debugger->createStackTrace(messageStackTrace, messageStackTrace->GetFrameCount())->buildInspectorObject());
-    return exceptionDetails.release();
+    if (!tryCatch.HasCaught()) {
+        if (resultValue.IsEmpty()) {
+            *errorString = "Internal error";
+            return;
+        }
+        OwnPtr<RemoteObject> remoteObject = injectedScript->wrapObject(errorString, resultValue, objectGroup, returnByValue, generatePreview);
+        if (!remoteObject)
+            return;
+        if (objectGroup == "console" && !injectedScript->setLastEvaluationResult(errorString, resultValue))
+            return;
+        *result = remoteObject.release();
+        *wasThrown = false;
+    } else {
+        v8::Local<v8::Value> exception = tryCatch.Exception();
+        OwnPtr<RemoteObject> remoteObject = injectedScript->wrapObject(errorString, exception, objectGroup, false, generatePreview && !exception->IsNativeError());
+        if (!remoteObject)
+            return;
+        *result = remoteObject.release();

[dgozman, 2016/03/17 19:16:12]

Move after error checking.

[kozy, 2016/03/17 20:48:56]

Done.

+        OwnPtr<ExceptionDetails> exceptionDetailsObject = createExceptionDetails(debugger, injectedScript->context(), tryCatch.Message());
+        if (!exceptionDetailsObject) {

[dgozman, 2016/03/17 19:16:12]

It always returns something.

[kozy, 2016/03/17 20:48:56]

Done.

+            *errorString = "Internal error";
+            return;
+        }
+        *exceptionDetails = exceptionDetailsObject.release();
+        *wasThrown = true;
+    }
 }
 
 } // namespace blink