[inspector] migrate Runtime to new style

src/inspector/v8-debugger-agent-impl.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/inspector/v8-debugger-agent-impl.h"
 
 #include <algorithm>
 
 #include "src/debug/debug-interface.h"
 #include "src/inspector/injected-script.h"
 #include "src/inspector/inspected-context.h"
 #include "src/inspector/java-script-call-frame.h"
 #include "src/inspector/protocol/Protocol.h"
 #include "src/inspector/remote-object-id.h"
 #include "src/inspector/script-breakpoint.h"
 #include "src/inspector/search-util.h"
 #include "src/inspector/string-util.h"
 #include "src/inspector/v8-debugger-script.h"
 #include "src/inspector/v8-debugger.h"
 #include "src/inspector/v8-inspector-impl.h"
 #include "src/inspector/v8-inspector-session-impl.h"
 #include "src/inspector/v8-regex.h"
 #include "src/inspector/v8-runtime-agent-impl.h"
 #include "src/inspector/v8-stack-trace-impl.h"
+#include "src/inspector/v8-value-copier.h"
 
 #include "include/v8-inspector.h"
 
 namespace v8_inspector {
 
 using protocol::Array;
 using protocol::Maybe;
 using protocol::Debugger::BreakpointId;
 using protocol::Debugger::CallFrame;
 using protocol::Runtime::ExceptionDetails;
@@ skipping 518 matching lines @@
   if (!callFrames) return;
   *newCallFrames = std::move(callFrames);
   *asyncStackTrace = currentAsyncStackTrace();
 }
 
 void V8DebuggerAgentImpl::restartFrame(
     ErrorString* errorString, const String16& callFrameId,
     std::unique_ptr<Array<CallFrame>>* newCallFrames,
     Maybe<StackTrace>* asyncStackTrace) {
   if (!assertPaused(errorString)) return;
-  InjectedScript::CallFrameScope scope(
-      errorString, m_inspector, m_session->contextGroupId(), callFrameId);
-  if (!scope.initialize()) return;
+  InjectedScript::CallFrameScope scope(m_inspector, m_session->contextGroupId(),
+                                       callFrameId);
+  Response response = scope.initialize();
+  if (!response.isSuccess()) {
+    *errorString = response.errorMessage();
+    return;
+  }
   if (scope.frameOrdinal() >= m_pausedCallFrames.size()) {
     *errorString = "Could not find call frame with given id";
     return;
   }
 
   v8::Local<v8::Value> resultValue;
   v8::Local<v8::Boolean> result;
   if (!m_pausedCallFrames[scope.frameOrdinal()]->restart().ToLocal(
           &resultValue) ||
       scope.tryCatch().HasCaught() ||
@@ skipping 132 matching lines @@
 }
 
 void V8DebuggerAgentImpl::evaluateOnCallFrame(
     ErrorString* errorString, const String16& callFrameId,
     const String16& expression, const Maybe<String16>& objectGroup,
     const Maybe<bool>& includeCommandLineAPI, const Maybe<bool>& silent,
     const Maybe<bool>& returnByValue, const Maybe<bool>& generatePreview,
     std::unique_ptr<RemoteObject>* result,
     Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails) {
   if (!assertPaused(errorString)) return;
-  InjectedScript::CallFrameScope scope(
-      errorString, m_inspector, m_session->contextGroupId(), callFrameId);
-  if (!scope.initialize()) return;
+  InjectedScript::CallFrameScope scope(m_inspector, m_session->contextGroupId(),
+                                       callFrameId);
+  Response response = scope.initialize();
+  if (!response.isSuccess()) {
+    *errorString = response.errorMessage();
+    return;
+  }
   if (scope.frameOrdinal() >= m_pausedCallFrames.size()) {
     *errorString = "Could not find call frame with given id";
     return;
   }
 
-  if (includeCommandLineAPI.fromMaybe(false) && !scope.installCommandLineAPI())
-    return;
+  if (includeCommandLineAPI.fromMaybe(false)) scope.installCommandLineAPI();
   if (silent.fromMaybe(false)) scope.ignoreExceptionsAndMuteConsole();
 
   v8::MaybeLocal<v8::Value> maybeResultValue =
       m_pausedCallFrames[scope.frameOrdinal()]->evaluate(
           toV8String(m_isolate, expression));
 
   // Re-initialize after running client's code, as it could have destroyed
   // context or session.
-  if (!scope.initialize()) return;
-  scope.injectedScript()->wrapEvaluateResult(
-      errorString, maybeResultValue, scope.tryCatch(),
-      objectGroup.fromMaybe(""), returnByValue.fromMaybe(false),
-      generatePreview.fromMaybe(false), result, exceptionDetails);
+  response = scope.initialize();
+  if (!response.isSuccess()) {
+    *errorString = response.errorMessage();
+    return;
+  }
+  response = scope.injectedScript()->wrapEvaluateResult(
+      maybeResultValue, scope.tryCatch(), objectGroup.fromMaybe(""),
+      returnByValue.fromMaybe(false), generatePreview.fromMaybe(false), result,
+      exceptionDetails);
+  if (!response.isSuccess()) *errorString = response.errorMessage();
 }
 
 void V8DebuggerAgentImpl::setVariableValue(
     ErrorString* errorString, int scopeNumber, const String16& variableName,
     std::unique_ptr<protocol::Runtime::CallArgument> newValueArgument,
     const String16& callFrameId) {
   if (!checkEnabled(errorString)) return;
   if (!assertPaused(errorString)) return;
-  InjectedScript::CallFrameScope scope(
-      errorString, m_inspector, m_session->contextGroupId(), callFrameId);
-  if (!scope.initialize()) return;
-
+  InjectedScript::CallFrameScope scope(m_inspector, m_session->contextGroupId(),
+                                       callFrameId);
+  Response response = scope.initialize();
+  if (!response.isSuccess()) {
+    *errorString = response.errorMessage();
+    return;
+  }
   v8::Local<v8::Value> newValue;
-  if (!scope.injectedScript()
-           ->resolveCallArgument(errorString, newValueArgument.get())
-           .ToLocal(&newValue))
+  response = scope.injectedScript()->resolveCallArgument(newValueArgument.get(),
+                                                         &newValue);
+  if (!response.isSuccess()) {
+    *errorString = response.errorMessage();
     return;
+  }
 
   if (scope.frameOrdinal() >= m_pausedCallFrames.size()) {
     *errorString = "Could not find call frame with given id";
     return;
   }
   v8::MaybeLocal<v8::Value> result =
       m_pausedCallFrames[scope.frameOrdinal()]->setVariableValue(
           scopeNumber, toV8String(m_isolate, variableName), newValue);
   if (scope.tryCatch().HasCaught() || result.IsEmpty()) {
     *errorString = "Internal error";
@@ skipping 132 matching lines @@
       else if (m_scheduledDebuggerStep == StepOut)
         m_skipNextDebuggerStepOut = true;
     }
   }
 }
 
 std::unique_ptr<Array<CallFrame>> V8DebuggerAgentImpl::currentCallFrames(
     ErrorString* errorString) {
   if (m_pausedContext.IsEmpty() || !m_pausedCallFrames.size())
     return Array<CallFrame>::create();
-  ErrorString ignored;
   v8::HandleScope handles(m_isolate);
   v8::Local<v8::Context> debuggerContext =
       v8::DebugInterface::GetDebugContext(m_isolate);
   v8::Context::Scope contextScope(debuggerContext);
 
   v8::Local<v8::Array> objects = v8::Array::New(m_isolate);
 
   for (size_t frameOrdinal = 0; frameOrdinal < m_pausedCallFrames.size();
        ++frameOrdinal) {
     const std::unique_ptr<JavaScriptCallFrame>& currentCallFrame =
         m_pausedCallFrames[frameOrdinal];
 
     v8::Local<v8::Object> details = currentCallFrame->details();
     if (hasInternalError(errorString, details.IsEmpty()))
       return Array<CallFrame>::create();
 
     int contextId = currentCallFrame->contextId();
-    InjectedScript* injectedScript =
-        contextId ? m_session->findInjectedScript(&ignored, contextId)
-                  : nullptr;
+
+    InjectedScript* injectedScript = nullptr;
+    if (contextId) m_session->findInjectedScript(contextId, injectedScript);
 
     String16 callFrameId =
         RemoteCallFrameId::serialize(contextId, static_cast<int>(frameOrdinal));
     if (hasInternalError(
             errorString,
             !details
                  ->Set(debuggerContext,
                        toV8StringInternalized(m_isolate, "callFrameId"),
                        toV8String(m_isolate, callFrameId))
                  .FromMaybe(false)))
       return Array<CallFrame>::create();
 
     if (injectedScript) {
       v8::Local<v8::Value> scopeChain;
       if (hasInternalError(
               errorString,
               !details->Get(debuggerContext,
                             toV8StringInternalized(m_isolate, "scopeChain"))
                       .ToLocal(&scopeChain) ||
                   !scopeChain->IsArray()))
         return Array<CallFrame>::create();
       v8::Local<v8::Array> scopeChainArray = scopeChain.As<v8::Array>();
-      if (!injectedScript->wrapPropertyInArray(
-              errorString, scopeChainArray,
-              toV8StringInternalized(m_isolate, "object"),
-              backtraceObjectGroup))
+      Response response = injectedScript->wrapPropertyInArray(
+          scopeChainArray, toV8StringInternalized(m_isolate, "object"),
+          backtraceObjectGroup);
+      if (!response.isSuccess()) {
+        *errorString = response.errorMessage();
         return Array<CallFrame>::create();
-      if (!injectedScript->wrapObjectProperty(
-              errorString, details, toV8StringInternalized(m_isolate, "this"),
-              backtraceObjectGroup))
+      }
+      response = injectedScript->wrapObjectProperty(
+          details, toV8StringInternalized(m_isolate, "this"),
+          backtraceObjectGroup);
+      if (!response.isSuccess()) {
+        *errorString = response.errorMessage();
         return Array<CallFrame>::create();
+      }
       if (details
               ->Has(debuggerContext,
                     toV8StringInternalized(m_isolate, "returnValue"))
               .FromMaybe(false)) {
-        if (!injectedScript->wrapObjectProperty(
-                errorString, details,
-                toV8StringInternalized(m_isolate, "returnValue"),
-                backtraceObjectGroup))
+        response = injectedScript->wrapObjectProperty(
+            details, toV8StringInternalized(m_isolate, "returnValue"),
+            backtraceObjectGroup);
+        if (!response.isSuccess()) {
+          *errorString = response.errorMessage();
           return Array<CallFrame>::create();
+        }
       }
     } else {
       if (hasInternalError(errorString, !details
                                              ->Set(debuggerContext,
                                                    toV8StringInternalized(
                                                        m_isolate, "scopeChain"),
                                                    v8::Array::New(m_isolate, 0))
                                              .FromMaybe(false)))
         return Array<CallFrame>::create();
       v8::Local<v8::Object> remoteObject = v8::Object::New(m_isolate);
@@ skipping 22 matching lines @@
     }
 
     if (hasInternalError(
             errorString,
             !objects
                  ->Set(debuggerContext, static_cast<int>(frameOrdinal), details)
                  .FromMaybe(false)))
       return Array<CallFrame>::create();
   }
 
-  std::unique_ptr<protocol::Value> protocolValue =
-      toProtocolValue(errorString, debuggerContext, objects);
-  if (!protocolValue) return Array<CallFrame>::create();
+  std::unique_ptr<protocol::Value> protocolValue;
+  Response response = toProtocolValue(debuggerContext, objects, &protocolValue);
+  if (!response.isSuccess()) return Array<CallFrame>::create();
   protocol::ErrorSupport errorSupport;
   std::unique_ptr<Array<CallFrame>> callFrames =
       Array<CallFrame>::parse(protocolValue.get(), &errorSupport);
   if (hasInternalError(errorString, !callFrames))
     return Array<CallFrame>::create();
   return callFrames;
 }
 
 std::unique_ptr<StackTrace> V8DebuggerAgentImpl::currentAsyncStackTrace() {
   if (m_pausedContext.IsEmpty()) return nullptr;
@@ skipping 94 matching lines @@
   // Skip pauses inside V8 internal scripts and on syntax errors.
   if (!topCallFrame) return RequestContinue;
 
   DCHECK(m_pausedContext.IsEmpty());
   JavaScriptCallFrames frames = m_debugger->currentCallFrames();
   m_pausedCallFrames.swap(frames);
   m_pausedContext.Reset(m_isolate, context);
   v8::HandleScope handles(m_isolate);
 
   if (!exception.IsEmpty()) {
-    ErrorString ignored;
-    InjectedScript* injectedScript =
-        m_session->findInjectedScript(&ignored, V8Debugger::contextId(context));
+    InjectedScript* injectedScript = nullptr;
+    m_session->findInjectedScript(V8Debugger::contextId(context),
+                                  injectedScript);
     if (injectedScript) {
       m_breakReason =
           isPromiseRejection
               ? protocol::Debugger::Paused::ReasonEnum::PromiseRejection
               : protocol::Debugger::Paused::ReasonEnum::Exception;
-      ErrorString errorString;
-      auto obj = injectedScript->wrapObject(&errorString, exception,
-                                            backtraceObjectGroup);
+      std::unique_ptr<protocol::Runtime::RemoteObject> obj;
+      injectedScript->wrapObject(exception, backtraceObjectGroup, false, false,
+                                 &obj);
       m_breakAuxData = obj ? obj->serialize() : nullptr;
       // m_breakAuxData might be null after this.
     }
   }
 
   std::unique_ptr<Array<String16>> hitBreakpointIds = Array<String16>::create();
 
   for (const auto& point : hitBreakpoints) {
     DebugServerBreakpointToBreakpointIdAndSourceMap::iterator
         breakpointIterator = m_serverBreakpoints.find(point);
@@ skipping 91 matching lines @@
 
 void V8DebuggerAgentImpl::reset() {
   if (!enabled()) return;
   m_scheduledDebuggerStep = NoStep;
   m_scripts.clear();
   m_blackboxedPositions.clear();
   m_breakpointIdToDebuggerBreakpointIds.clear();
 }
 
 }  // namespace v8_inspector