Changeset 201211 in webkit
- Timestamp:
- May 19, 2016 11:32:02 PM (8 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r201210 r201211 1 2016-05-19 Joseph Pecoraro <pecoraro@apple.com> 2 3 Web Inspector: Can't resume Debugger after breaking on exception in Promise 4 https://bugs.webkit.org/show_bug.cgi?id=157240 5 <rdar://problem/26030890> 6 7 Reviewed by Timothy Hatcher. 8 9 If we pause but have no source code to show we paused in purely internal 10 code. In such cases we were attempting to resume without actually 11 telling the backend to resume, so the backend and frontend were out of 12 sync. The frontend thinking it is "paused" without an activeCallFrame 13 and the backend actually being paused. 14 15 This change more gracefully handles this situation. It actually resumes 16 both the frontend and the backend. 17 18 * UserInterface/Controllers/DebuggerManager.js: 19 (WebInspector.DebuggerManager.prototype.debuggerDidPause): 20 Resume the backend and the frontend. 21 22 (WebInspector.DebuggerManager.prototype._didResumeInternal): 23 Don't look at the active call frame, look at the paused state. 24 This may issue a Resumed event without actually triggering a 25 Paused event if this was the only pause, but that is harmless. 26 1 27 2016-05-19 Joseph Pecoraro <pecoraro@apple.com> 2 28 -
trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
r201099 r201211 522 522 523 523 if (!this._activeCallFrame) { 524 console.warn("We should always have one call frame. This could indicate we are hitting an exception or debugger statement in an internal injected script."); 524 // This indicates we were pausing in internal scripts only (Injected Scripts, built-ins). 525 // Just resume and skip past this pause. 526 DebuggerAgent.resume(); 525 527 this._didResumeInternal(); 526 528 return; … … 917 919 _didResumeInternal() 918 920 { 919 if (!this._ activeCallFrame)921 if (!this._paused) 920 922 return; 921 923
Note: See TracChangeset
for help on using the changeset viewer.