[DevTools] Wrap call frame with its injected script instead top injected script

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

 // Copyright 2015 The Chromium 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 "platform/v8_inspector/V8DebuggerAgentImpl.h"
 
 #include "platform/inspector_protocol/String16.h"
 #include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/IgnoreExceptionsScope.h"
 #include "platform/v8_inspector/InjectedScript.h"
@@ skipping 987 matching lines @@
     OwnPtr<JavaScriptCallFrame> javaScriptCallFrame = debugger().callFrame(remoteId->frameOrdinal());
     if (!javaScriptCallFrame) {
         *errorString = "Could not find call frame with given id";
         return;
     }
 
     v8::MaybeLocal<v8::Object> commandLineAPI = includeCommandLineAPI.fromMaybe(false) ? injectedScript->commandLineAPI(errorString) : v8::MaybeLocal<v8::Object>();
     if (includeCommandLineAPI.fromMaybe(false) && commandLineAPI.IsEmpty())
         return;
 
-    InjectedScriptManager::ScopedGlobalObjectExtension scopeExtension(injectedScript, m_injectedScriptManager, commandLineAPI);
+    InjectedScript::ScopedGlobalObjectExtension scopeExtension(injectedScript, commandLineAPI);
 
     v8::TryCatch tryCatch(injectedScript->isolate());
 
     v8::MaybeLocal<v8::Value> maybeResultValue = javaScriptCallFrame->evaluate(toV8String(injectedScript->isolate(), expression));
 
     // InjectedScript may be gone after any evaluate call - find it again.
     injectedScript = m_injectedScriptManager->findInjectedScript(errorString, remoteId.get());
     if (!injectedScript)
         return;
 
@@ skipping 327 matching lines @@
             else if (m_scheduledDebuggerStep == StepOut)
                 m_skipNextDebuggerStepOut = true;
         }
     }
 }
 
 PassOwnPtr<Array<CallFrame>> V8DebuggerAgentImpl::currentCallFrames(ErrorString* errorString)
 {
     if (m_pausedContext.IsEmpty() || !m_currentCallStack)
         return Array<CallFrame>::create();
-    InjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedContext.Get(m_isolate));
-    if (!injectedScript) {
+    InjectedScript* topFrameInjectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedContext.Get(m_isolate));
+    if (!topFrameInjectedScript) {
         // Context has been reported as removed while on pause.
         return Array<CallFrame>::create();
     }
 
-    v8::Isolate* isolate = injectedScript->isolate();
+    v8::Isolate* isolate = topFrameInjectedScript->isolate();
     v8::HandleScope handles(isolate);
-    v8::Local<v8::Context> context = injectedScript->context();
+    v8::Local<v8::Context> context = topFrameInjectedScript->context();
     v8::Context::Scope contextScope(context);
 
     JavaScriptCallFrame* currentCallFrame = m_currentCallStack.get();
     int callFrameIndex = 0;
     OwnPtr<JavaScriptCallFrame> currentCallFrameOwner;
     v8::Local<v8::Array> objects = v8::Array::New(isolate);
     while (currentCallFrame) {
         v8::Local<v8::Object> details = currentCallFrame->details();
         if (hasInternalError(errorString, details.IsEmpty()))
             return Array<CallFrame>::create();
 
+        int contextId = currentCallFrame->contextId();
+        InjectedScript* injectedScript = contextId ? m_injectedScriptManager->findInjectedScript(errorString, contextId) : nullptr;
+        if (!injectedScript) {
+            *errorString = "";

[dgozman, 2016/03/28 16:14:30]

Pass different error string instead.

[kozy, 2016/03/28 17:59:19]

Done.

+            injectedScript = topFrameInjectedScript;
+        }
+
         String16 callFrameId = RemoteCallFrameId::serialize(injectedScript->contextId(), callFrameIndex);
         if (hasInternalError(errorString, !details->Set(context, toV8StringInternalized(isolate, "callFrameId"), toV8String(isolate, callFrameId)).FromMaybe(false)))
             return Array<CallFrame>::create();
 
         v8::Local<v8::Value> scopeChain;
         if (hasInternalError(errorString, !details->Get(context, toV8StringInternalized(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(isolate, "object"), V8DebuggerAgentImpl::backtraceObjectGroup))
             return Array<CallFrame>::create();
@@ skipping 249 matching lines @@
     if (!enabled())
         return;
     m_scheduledDebuggerStep = NoStep;
     m_scripts.clear();
     m_blackboxedPositions.clear();
     m_breakpointIdToDebuggerBreakpointIds.clear();
     resetAsyncCallTracker();
 }
 
 } // namespace blink