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

Side by Side Diff: Source/core/inspector/InspectorDebuggerAgent.cpp

Issue 433653003: Support Promises event-based instrumentation on backend. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address comments Created 6 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 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 if (eventType == v8AsyncTaskEventEnqueue) 874 if (eventType == v8AsyncTaskEventEnqueue)
875 m_asyncCallStackTracker.didEnqueueV8AsyncTask(context, eventName, id, sc riptDebugServer().currentCallFramesForAsyncStack()); 875 m_asyncCallStackTracker.didEnqueueV8AsyncTask(context, eventName, id, sc riptDebugServer().currentCallFramesForAsyncStack());
876 else if (eventType == v8AsyncTaskEventWillHandle) 876 else if (eventType == v8AsyncTaskEventWillHandle)
877 m_asyncCallStackTracker.willHandleV8AsyncTask(context, eventName, id); 877 m_asyncCallStackTracker.willHandleV8AsyncTask(context, eventName, id);
878 else if (eventType == v8AsyncTaskEventDidHandle) 878 else if (eventType == v8AsyncTaskEventDidHandle)
879 m_asyncCallStackTracker.didFireAsyncCall(); 879 m_asyncCallStackTracker.didFireAsyncCall();
880 else 880 else
881 ASSERT_NOT_REACHED(); 881 ASSERT_NOT_REACHED();
882 } 882 }
883 883
884 void InspectorDebuggerAgent::didReceiveV8PromiseEvent(ScriptState* scriptState, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status)
885 {
886 if (!m_promiseTracker.isEnabled())
887 return;
888 m_promiseTracker.didReceiveV8PromiseEvent(scriptState, promise, parentPromis e, status);
889 }
890
884 void InspectorDebuggerAgent::pause(ErrorString*) 891 void InspectorDebuggerAgent::pause(ErrorString*)
885 { 892 {
886 if (m_javaScriptPauseScheduled || isPaused()) 893 if (m_javaScriptPauseScheduled || isPaused())
887 return; 894 return;
888 clearBreakDetails(); 895 clearBreakDetails();
889 m_javaScriptPauseScheduled = true; 896 m_javaScriptPauseScheduled = true;
890 scriptDebugServer().setPauseOnNextStatement(true); 897 scriptDebugServer().setPauseOnNextStatement(true);
891 } 898 }
892 899
893 void InspectorDebuggerAgent::resume(ErrorString* errorString) 900 void InspectorDebuggerAgent::resume(ErrorString* errorString)
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 scriptDebugServer().breakProgram(); 1384 scriptDebugServer().breakProgram();
1378 } 1385 }
1379 1386
1380 void InspectorDebuggerAgent::clear() 1387 void InspectorDebuggerAgent::clear()
1381 { 1388 {
1382 m_pausedScriptState = nullptr; 1389 m_pausedScriptState = nullptr;
1383 m_currentCallStack = ScriptValue(); 1390 m_currentCallStack = ScriptValue();
1384 m_scripts.clear(); 1391 m_scripts.clear();
1385 m_breakpointIdToDebugServerBreakpointIds.clear(); 1392 m_breakpointIdToDebugServerBreakpointIds.clear();
1386 m_asyncCallStackTracker.clear(); 1393 m_asyncCallStackTracker.clear();
1394 m_promiseTracker.clear();
1387 m_continueToLocationBreakpointId = String(); 1395 m_continueToLocationBreakpointId = String();
1388 clearBreakDetails(); 1396 clearBreakDetails();
1389 m_javaScriptPauseScheduled = false; 1397 m_javaScriptPauseScheduled = false;
1390 m_debuggerStepScheduled = false; 1398 m_debuggerStepScheduled = false;
1391 m_steppingFromFramework = false; 1399 m_steppingFromFramework = false;
1392 m_pausingOnNativeEvent = false; 1400 m_pausingOnNativeEvent = false;
1393 ErrorString error; 1401 ErrorString error;
1394 setOverlayMessage(&error, 0); 1402 setOverlayMessage(&error, 0);
1395 } 1403 }
1396 1404
(...skipping 22 matching lines...) Expand all
1419 void InspectorDebuggerAgent::removeBreakpoint(const String& scriptId, int lineNu mber, int columnNumber, BreakpointSource source) 1427 void InspectorDebuggerAgent::removeBreakpoint(const String& scriptId, int lineNu mber, int columnNumber, BreakpointSource source)
1420 { 1428 {
1421 removeBreakpoint(generateBreakpointId(scriptId, lineNumber, columnNumber, so urce)); 1429 removeBreakpoint(generateBreakpointId(scriptId, lineNumber, columnNumber, so urce));
1422 } 1430 }
1423 1431
1424 void InspectorDebuggerAgent::reset() 1432 void InspectorDebuggerAgent::reset()
1425 { 1433 {
1426 m_scripts.clear(); 1434 m_scripts.clear();
1427 m_breakpointIdToDebugServerBreakpointIds.clear(); 1435 m_breakpointIdToDebugServerBreakpointIds.clear();
1428 m_asyncCallStackTracker.clear(); 1436 m_asyncCallStackTracker.clear();
1437 m_promiseTracker.clear();
1429 if (m_frontend) 1438 if (m_frontend)
1430 m_frontend->globalObjectCleared(); 1439 m_frontend->globalObjectCleared();
1431 } 1440 }
1432 1441
1433 void InspectorDebuggerAgent::trace(Visitor* visitor) 1442 void InspectorDebuggerAgent::trace(Visitor* visitor)
1434 { 1443 {
1435 visitor->trace(m_injectedScriptManager); 1444 visitor->trace(m_injectedScriptManager);
1436 visitor->trace(m_listener); 1445 visitor->trace(m_listener);
1437 InspectorBaseAgent::trace(visitor); 1446 InspectorBaseAgent::trace(visitor);
1438 } 1447 }
1439 1448
1440 } // namespace blink 1449 } // namespace blink
1441 1450
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698