| 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 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 asyncCallStackTracker().didFireAsyncCall(); | 755 asyncCallStackTracker().didFireAsyncCall(); |
| 756 else | 756 else |
| 757 ASSERT_NOT_REACHED(); | 757 ASSERT_NOT_REACHED(); |
| 758 } | 758 } |
| 759 | 759 |
| 760 bool InspectorDebuggerAgent::v8PromiseEventsEnabled() const | 760 bool InspectorDebuggerAgent::v8PromiseEventsEnabled() const |
| 761 { | 761 { |
| 762 return promiseTracker().isEnabled() || (m_listener && m_listener->canPauseOn
PromiseEvent()); | 762 return promiseTracker().isEnabled() || (m_listener && m_listener->canPauseOn
PromiseEvent()); |
| 763 } | 763 } |
| 764 | 764 |
| 765 void InspectorDebuggerAgent::didReceiveV8PromiseEvent(ScriptState* scriptState,
v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) | 765 void InspectorDebuggerAgent::didReceiveV8PromiseEvent(ScriptState* scriptState,
v8::Local<v8::Object> promise, v8::Local<v8::Value> parentPromise, int status) |
| 766 { | 766 { |
| 767 if (promiseTracker().isEnabled()) | 767 if (promiseTracker().isEnabled()) |
| 768 promiseTracker().didReceiveV8PromiseEvent(scriptState, promise, parentPr
omise, status); | 768 promiseTracker().didReceiveV8PromiseEvent(scriptState, promise, parentPr
omise, status); |
| 769 if (!m_listener) | 769 if (!m_listener) |
| 770 return; | 770 return; |
| 771 if (!parentPromise.IsEmpty() && parentPromise->IsObject()) | 771 if (!parentPromise.IsEmpty() && parentPromise->IsObject()) |
| 772 return; | 772 return; |
| 773 if (status < 0) | 773 if (status < 0) |
| 774 m_listener->didRejectPromise(); | 774 m_listener->didRejectPromise(); |
| 775 else if (status > 0) | 775 else if (status > 0) |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1491 visitor->trace(m_injectedScriptManager); | 1491 visitor->trace(m_injectedScriptManager); |
| 1492 visitor->trace(m_listener); | 1492 visitor->trace(m_listener); |
| 1493 visitor->trace(m_asyncCallStackTracker); | 1493 visitor->trace(m_asyncCallStackTracker); |
| 1494 #if ENABLE(OILPAN) | 1494 #if ENABLE(OILPAN) |
| 1495 visitor->trace(m_promiseTracker); | 1495 visitor->trace(m_promiseTracker); |
| 1496 #endif | 1496 #endif |
| 1497 InspectorBaseAgent::trace(visitor); | 1497 InspectorBaseAgent::trace(visitor); |
| 1498 } | 1498 } |
| 1499 | 1499 |
| 1500 } // namespace blink | 1500 } // namespace blink |
| OLD | NEW |