| OLD | NEW |
| 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 877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 888 if (eventType == v8AsyncTaskEventEnqueue) | 888 if (eventType == v8AsyncTaskEventEnqueue) |
| 889 m_asyncCallStackTracker.didEnqueueV8AsyncTask(context, eventName, id, sc
riptDebugServer().currentCallFramesForAsyncStack()); | 889 m_asyncCallStackTracker.didEnqueueV8AsyncTask(context, eventName, id, sc
riptDebugServer().currentCallFramesForAsyncStack()); |
| 890 else if (eventType == v8AsyncTaskEventWillHandle) | 890 else if (eventType == v8AsyncTaskEventWillHandle) |
| 891 m_asyncCallStackTracker.willHandleV8AsyncTask(context, eventName, id); | 891 m_asyncCallStackTracker.willHandleV8AsyncTask(context, eventName, id); |
| 892 else if (eventType == v8AsyncTaskEventDidHandle) | 892 else if (eventType == v8AsyncTaskEventDidHandle) |
| 893 m_asyncCallStackTracker.didFireAsyncCall(); | 893 m_asyncCallStackTracker.didFireAsyncCall(); |
| 894 else | 894 else |
| 895 ASSERT_NOT_REACHED(); | 895 ASSERT_NOT_REACHED(); |
| 896 } | 896 } |
| 897 | 897 |
| 898 void InspectorDebuggerAgent::didReceiveV8PromiseEvent(ScriptState* scriptState,
v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) |
| 899 { |
| 900 if (!m_promiseTracker.isEnabled()) |
| 901 return; |
| 902 m_promiseTracker.didReceiveV8PromiseEvent(scriptState, promise, parentPromis
e, status); |
| 903 } |
| 904 |
| 898 void InspectorDebuggerAgent::pause(ErrorString*) | 905 void InspectorDebuggerAgent::pause(ErrorString*) |
| 899 { | 906 { |
| 900 if (m_javaScriptPauseScheduled || isPaused()) | 907 if (m_javaScriptPauseScheduled || isPaused()) |
| 901 return; | 908 return; |
| 902 clearBreakDetails(); | 909 clearBreakDetails(); |
| 903 m_javaScriptPauseScheduled = true; | 910 m_javaScriptPauseScheduled = true; |
| 904 scriptDebugServer().setPauseOnNextStatement(true); | 911 scriptDebugServer().setPauseOnNextStatement(true); |
| 905 } | 912 } |
| 906 | 913 |
| 907 void InspectorDebuggerAgent::resume(ErrorString* errorString) | 914 void InspectorDebuggerAgent::resume(ErrorString* errorString) |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1391 scriptDebugServer().breakProgram(); | 1398 scriptDebugServer().breakProgram(); |
| 1392 } | 1399 } |
| 1393 | 1400 |
| 1394 void InspectorDebuggerAgent::clear() | 1401 void InspectorDebuggerAgent::clear() |
| 1395 { | 1402 { |
| 1396 m_pausedScriptState = nullptr; | 1403 m_pausedScriptState = nullptr; |
| 1397 m_currentCallStack = ScriptValue(); | 1404 m_currentCallStack = ScriptValue(); |
| 1398 m_scripts.clear(); | 1405 m_scripts.clear(); |
| 1399 m_breakpointIdToDebugServerBreakpointIds.clear(); | 1406 m_breakpointIdToDebugServerBreakpointIds.clear(); |
| 1400 m_asyncCallStackTracker.clear(); | 1407 m_asyncCallStackTracker.clear(); |
| 1408 m_promiseTracker.clear(); |
| 1401 m_continueToLocationBreakpointId = String(); | 1409 m_continueToLocationBreakpointId = String(); |
| 1402 clearBreakDetails(); | 1410 clearBreakDetails(); |
| 1403 m_javaScriptPauseScheduled = false; | 1411 m_javaScriptPauseScheduled = false; |
| 1404 m_debuggerStepScheduled = false; | 1412 m_debuggerStepScheduled = false; |
| 1405 m_steppingFromFramework = false; | 1413 m_steppingFromFramework = false; |
| 1406 m_pausingOnNativeEvent = false; | 1414 m_pausingOnNativeEvent = false; |
| 1407 ErrorString error; | 1415 ErrorString error; |
| 1408 setOverlayMessage(&error, 0); | 1416 setOverlayMessage(&error, 0); |
| 1409 } | 1417 } |
| 1410 | 1418 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 1433 void InspectorDebuggerAgent::removeBreakpoint(const String& scriptId, int lineNu
mber, int columnNumber, BreakpointSource source) | 1441 void InspectorDebuggerAgent::removeBreakpoint(const String& scriptId, int lineNu
mber, int columnNumber, BreakpointSource source) |
| 1434 { | 1442 { |
| 1435 removeBreakpoint(generateBreakpointId(scriptId, lineNumber, columnNumber, so
urce)); | 1443 removeBreakpoint(generateBreakpointId(scriptId, lineNumber, columnNumber, so
urce)); |
| 1436 } | 1444 } |
| 1437 | 1445 |
| 1438 void InspectorDebuggerAgent::reset() | 1446 void InspectorDebuggerAgent::reset() |
| 1439 { | 1447 { |
| 1440 m_scripts.clear(); | 1448 m_scripts.clear(); |
| 1441 m_breakpointIdToDebugServerBreakpointIds.clear(); | 1449 m_breakpointIdToDebugServerBreakpointIds.clear(); |
| 1442 m_asyncCallStackTracker.clear(); | 1450 m_asyncCallStackTracker.clear(); |
| 1451 m_promiseTracker.clear(); |
| 1443 if (m_frontend) | 1452 if (m_frontend) |
| 1444 m_frontend->globalObjectCleared(); | 1453 m_frontend->globalObjectCleared(); |
| 1445 } | 1454 } |
| 1446 | 1455 |
| 1447 void InspectorDebuggerAgent::trace(Visitor* visitor) | 1456 void InspectorDebuggerAgent::trace(Visitor* visitor) |
| 1448 { | 1457 { |
| 1449 visitor->trace(m_injectedScriptManager); | 1458 visitor->trace(m_injectedScriptManager); |
| 1450 visitor->trace(m_listener); | 1459 visitor->trace(m_listener); |
| 1451 InspectorBaseAgent::trace(visitor); | 1460 InspectorBaseAgent::trace(visitor); |
| 1452 } | 1461 } |
| 1453 | 1462 |
| 1454 } // namespace blink | 1463 } // namespace blink |
| 1455 | 1464 |
| OLD | NEW |