[DevTools] Move evaluate from InjectedScriptSource.js 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 90 matching lines @@
     const Maybe<bool>& generatePreview,
     const Maybe<bool>& userGesture,
     OwnPtr<RemoteObject>* result,
     Maybe<bool>* wasThrown,
     Maybe<ExceptionDetails>* exceptionDetails)
 {
     if (!executionContextId.isJust()) {
         *errorString = "Cannot find default execution context";
         return;
     }
-    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId.fromJust());
-    if (!injectedScript) {
-        *errorString = "Cannot find execution context with given id";
+    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(errorString, executionContextId.fromJust());
+    if (!injectedScript)
+        return;
+
+    v8::HandleScope scope(injectedScript->isolate());
+    v8::Local<v8::Context> localContext = injectedScript->context();
+    v8::Context::Scope contextScope(localContext);
+
+    if (!injectedScript->canAccessInspectedWindow()) {
+        *errorString = "Can not access given context";
+        return;
+    }
+    InjectedScriptManager::InjectScopeExtensionByName scopeExtension(errorString, injectedScript, false, includeCommandLineAPI.fromMaybe(false) ? "commandLineAPI" : String16());
+    if (scopeExtension.hasError()) {
+        *errorString = "Internal error";
         return;
     }
     IgnoreExceptionsScope ignoreExceptionsScope(doNotPauseOnExceptionsAndMuteConsole.fromMaybe(false) ? m_debugger : nullptr);
-    injectedScript->evaluate(errorString, expression, objectGroup.fromMaybe(""), includeCommandLineAPI.fromMaybe(false), returnByValue.fromMaybe(false), generatePreview.fromMaybe(false), result, wasThrown, exceptionDetails);
+
+    v8::TryCatch tryCatch(injectedScript->isolate());
+
+    v8::Local<v8::Value> resultValue;
+    bool success = m_debugger->compileAndRunInternalScript(localContext, toV8String(injectedScript->isolate(), expression)).ToLocal(&resultValue);
+    ALLOW_UNUSED_LOCAL(success);
+
+    injectedScript = m_injectedScriptManager->findInjectedScript(errorString, executionContextId.fromJust());

[pfeldman, 2016/03/17 21:24:22]

Is there a chance m_injectedScriptManager no longer exists?

[kozy, 2016/03/17 21:27:58]

We keep OwnPtr to manager in this agent.

+    if (!injectedScript)
+        return;
+
+    V8RuntimeAgentImpl::wrapEvaluateResult(errorString,
+        m_debugger,
+        injectedScript,
+        resultValue,
+        tryCatch,
+        objectGroup.fromMaybe(""),
+        returnByValue.fromMaybe(false),
+        generatePreview.fromMaybe(false),
+        result,
+        wasThrown,
+        exceptionDetails);
 }
 
 void V8RuntimeAgentImpl::callFunctionOn(ErrorString* errorString,
     const String16& objectId,
     const String16& expression,
     const Maybe<protocol::Array<protocol::Runtime::CallArgument>>& optionalArguments,
     const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole,
     const Maybe<bool>& returnByValue,
     const Maybe<bool>& generatePreview,
     const Maybe<bool>& userGesture,
@@ skipping 81 matching lines @@
     const String16& sourceURL,
     bool persistScript,
     int executionContextId,
     Maybe<String16>* scriptId,
     Maybe<ExceptionDetails>* exceptionDetails)
 {
     if (!m_enabled) {
         *errorString = "Runtime agent is not enabled";
         return;
     }
-    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);
-    if (!injectedScript) {
-        *errorString = "Inspected frame has gone";
+    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(errorString, executionContextId);
+    if (!injectedScript)
         return;
-    }
 
     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(m_debugger, injectedScript->context(), message);
@@ skipping 17 matching lines @@
     const Maybe<String16>& objectGroup,
     const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole,
     const Maybe<bool>& includeCommandLineAPI,
     OwnPtr<RemoteObject>* result,
     Maybe<ExceptionDetails>* exceptionDetails)
 {
     if (!m_enabled) {
         *errorString = "Runtime agent is not enabled";
         return;
     }
-    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);
-    if (!injectedScript) {
-        *errorString = "Inspected frame has gone";
+    InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(errorString, executionContextId);
+    if (!injectedScript)
         return;
-    }
 
     IgnoreExceptionsScope ignoreExceptionsScope(doNotPauseOnExceptionsAndMuteConsole.fromMaybe(false) ? m_debugger : nullptr);
 
     if (!m_compiledScripts.contains(scriptId)) {
         *errorString = "Script execution failed";
         return;
     }
 
     v8::Isolate* isolate = injectedScript->isolate();
     v8::HandleScope handles(isolate);
     v8::Local<v8::Context> context = injectedScript->context();
     v8::Context::Scope scope(context);
     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;
-
     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(m_debugger, injectedScript->context(), message);
-    } else {
-        value = maybeValue.ToLocalChecked();
-    }
+    v8::Local<v8::Value> resultValue;
+    bool success = m_debugger->runCompiledScript(context, script).ToLocal(&resultValue);
+    ALLOW_UNUSED_LOCAL(success);
 
-    if (value.IsEmpty()) {
-        *errorString = "Script execution failed";
+    injectedScript = m_injectedScriptManager->findInjectedScript(errorString, executionContextId);
+    if (!injectedScript)
         return;
-    }
 
-    injectedScript = m_injectedScriptManager->findInjectedScript(executionContextId);
-    if (!injectedScript) {
-        *errorString = "Inspected frame has gone during script running";
-        return;
-    }
-
-    OwnPtr<RemoteObject> resultObject = injectedScript->wrapObject(errorString, value, objectGroup.fromMaybe(""));
-    if (!resultObject)
-        return;
-    *result = resultObject.release();
+    V8RuntimeAgentImpl::wrapEvaluateResult(errorString,
+        m_debugger,
+        injectedScript,
+        resultValue,
+        tryCatch,
+        objectGroup.fromMaybe(""),
+        false,
+        false,
+        result,
+        nullptr,
+        exceptionDetails);
 }
 
 void V8RuntimeAgentImpl::setInspectorState(protocol::DictionaryValue* state)
 {
     m_state = state;
 }
 
 void V8RuntimeAgentImpl::setFrontend(protocol::Frontend::Runtime* frontend)
 {
     m_frontend = frontend;
@@ skipping 131 matching lines @@
         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;
+        if (wasThrown)
+            *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();
         OwnPtr<ExceptionDetails> exceptionDetailsObject = createExceptionDetails(debugger, injectedScript->context(), tryCatch.Message());
         if (!exceptionDetailsObject) {
             *errorString = "Internal error";
             return;
         }
+        *result = remoteObject.release();
         *exceptionDetails = exceptionDetailsObject.release();
-        *wasThrown = true;
+        if (wasThrown)
+            *wasThrown = true;
     }
 }
 
 } // namespace blink