Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp

Issue 2253643002: [DevTools] Copy objects from debugger context to inspected context properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "platform/v8_inspector/V8DebuggerAgentImpl.h" 5 #include "platform/v8_inspector/V8DebuggerAgentImpl.h"
6 6
7 #include "platform/v8_inspector/InjectedScript.h" 7 #include "platform/v8_inspector/InjectedScript.h"
8 #include "platform/v8_inspector/InspectedContext.h" 8 #include "platform/v8_inspector/InspectedContext.h"
9 #include "platform/v8_inspector/JavaScriptCallFrame.h" 9 #include "platform/v8_inspector/JavaScriptCallFrame.h"
10 #include "platform/v8_inspector/RemoteObjectId.h" 10 #include "platform/v8_inspector/RemoteObjectId.h"
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 if (!injectedScript->wrapObjectProperty(errorString, details, toV8St ringInternalized(m_isolate, "this"), backtraceObjectGroup)) 939 if (!injectedScript->wrapObjectProperty(errorString, details, toV8St ringInternalized(m_isolate, "this"), backtraceObjectGroup))
940 return Array<CallFrame>::create(); 940 return Array<CallFrame>::create();
941 if (details->Has(debuggerContext, toV8StringInternalized(m_isolate, "returnValue")).FromMaybe(false)) { 941 if (details->Has(debuggerContext, toV8StringInternalized(m_isolate, "returnValue")).FromMaybe(false)) {
942 if (!injectedScript->wrapObjectProperty(errorString, details, to V8StringInternalized(m_isolate, "returnValue"), backtraceObjectGroup)) 942 if (!injectedScript->wrapObjectProperty(errorString, details, to V8StringInternalized(m_isolate, "returnValue"), backtraceObjectGroup))
943 return Array<CallFrame>::create(); 943 return Array<CallFrame>::create();
944 } 944 }
945 } else { 945 } else {
946 if (hasInternalError(errorString, !details->Set(debuggerContext, toV 8StringInternalized(m_isolate, "scopeChain"), v8::Array::New(m_isolate, 0)).From Maybe(false))) 946 if (hasInternalError(errorString, !details->Set(debuggerContext, toV 8StringInternalized(m_isolate, "scopeChain"), v8::Array::New(m_isolate, 0)).From Maybe(false)))
947 return Array<CallFrame>::create(); 947 return Array<CallFrame>::create();
948 v8::Local<v8::Object> remoteObject = v8::Object::New(m_isolate); 948 v8::Local<v8::Object> remoteObject = v8::Object::New(m_isolate);
949 if (!remoteObject->SetPrototype(debuggerContext, v8::Null(m_isolate) ).FromMaybe(false))
950 return Array<CallFrame>::create();
949 if (hasInternalError(errorString, !remoteObject->Set(debuggerContext , toV8StringInternalized(m_isolate, "type"), toV8StringInternalized(m_isolate, " undefined")).FromMaybe(false))) 951 if (hasInternalError(errorString, !remoteObject->Set(debuggerContext , toV8StringInternalized(m_isolate, "type"), toV8StringInternalized(m_isolate, " undefined")).FromMaybe(false)))
950 return Array<CallFrame>::create(); 952 return Array<CallFrame>::create();
951 if (hasInternalError(errorString, !details->Set(debuggerContext, toV 8StringInternalized(m_isolate, "this"), remoteObject).FromMaybe(false))) 953 if (hasInternalError(errorString, !details->Set(debuggerContext, toV 8StringInternalized(m_isolate, "this"), remoteObject).FromMaybe(false)))
952 return Array<CallFrame>::create(); 954 return Array<CallFrame>::create();
953 if (hasInternalError(errorString, !details->Delete(debuggerContext, toV8StringInternalized(m_isolate, "returnValue")).FromMaybe(false))) 955 if (hasInternalError(errorString, !details->Delete(debuggerContext, toV8StringInternalized(m_isolate, "returnValue")).FromMaybe(false)))
954 return Array<CallFrame>::create(); 956 return Array<CallFrame>::create();
955 } 957 }
956 958
957 if (hasInternalError(errorString, !objects->Set(debuggerContext, frameOr dinal, details).FromMaybe(false))) 959 if (hasInternalError(errorString, !objects->Set(debuggerContext, frameOr dinal, details).FromMaybe(false)))
958 return Array<CallFrame>::create(); 960 return Array<CallFrame>::create();
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 { 1160 {
1159 if (!enabled()) 1161 if (!enabled())
1160 return; 1162 return;
1161 m_scheduledDebuggerStep = NoStep; 1163 m_scheduledDebuggerStep = NoStep;
1162 m_scripts.clear(); 1164 m_scripts.clear();
1163 m_blackboxedPositions.clear(); 1165 m_blackboxedPositions.clear();
1164 m_breakpointIdToDebuggerBreakpointIds.clear(); 1166 m_breakpointIdToDebuggerBreakpointIds.clear();
1165 } 1167 }
1166 1168
1167 } // namespace blink 1169 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698