Title: [210251] trunk
Revision
210251
Author
[email protected]
Date
2017-01-03 14:31:25 -0800 (Tue, 03 Jan 2017)

Log Message

Web Inspector: Address failures under LayoutTests/inspector/debugger/stepping
https://bugs.webkit.org/show_bug.cgi?id=166300

Reviewed by Brian Burg.

Source/_javascript_Core:

* debugger/Debugger.cpp:
(JSC::Debugger::continueProgram):
When continuing, clear states that would have had us pause again.

* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::didBecomeIdle):
When resuming after becoming idle, be sure to clear Debugger state.

LayoutTests:

* inspector/debugger/stepping/stepping-classes-expected.txt:
Rebaseline these results to new column values.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (210250 => 210251)


--- trunk/LayoutTests/ChangeLog	2017-01-03 22:31:22 UTC (rev 210250)
+++ trunk/LayoutTests/ChangeLog	2017-01-03 22:31:25 UTC (rev 210251)
@@ -1,5 +1,15 @@
 2017-01-03  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Address failures under LayoutTests/inspector/debugger/stepping
+        https://bugs.webkit.org/show_bug.cgi?id=166300
+
+        Reviewed by Brian Burg.
+
+        * inspector/debugger/stepping/stepping-classes-expected.txt:
+        Rebaseline these results to new column values.
+
+2017-01-03  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: Fix Content Flow Container Regions Computed Style section
         https://bugs.webkit.org/show_bug.cgi?id=166294
 

Modified: trunk/LayoutTests/inspector/debugger/stepping/stepping-classes-expected.txt (210250 => 210251)


--- trunk/LayoutTests/inspector/debugger/stepping/stepping-classes-expected.txt	2017-01-03 22:31:22 UTC (rev 210250)
+++ trunk/LayoutTests/inspector/debugger/stepping/stepping-classes-expected.txt	2017-01-03 22:31:25 UTC (rev 210251)
@@ -250,7 +250,7 @@
      69    function entryClassGetterSetter() {
 
 ACTION: step-in
-PAUSE AT Child2:1:16
+PAUSE AT Child2:1:23
 --- Source Unavailable ---
 
 ACTION: step-in
@@ -264,7 +264,7 @@
      20        baseMethod()
 
 ACTION: step-out
-PAUSE AT Child2:1:38
+PAUSE AT Child2:1:40
 --- Source Unavailable ---
 
 ACTION: step-out

Modified: trunk/Source/_javascript_Core/ChangeLog (210250 => 210251)


--- trunk/Source/_javascript_Core/ChangeLog	2017-01-03 22:31:22 UTC (rev 210250)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-01-03 22:31:25 UTC (rev 210251)
@@ -1,3 +1,18 @@
+2017-01-03  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Address failures under LayoutTests/inspector/debugger/stepping
+        https://bugs.webkit.org/show_bug.cgi?id=166300
+
+        Reviewed by Brian Burg.
+
+        * debugger/Debugger.cpp:
+        (JSC::Debugger::continueProgram):
+        When continuing, clear states that would have had us pause again.
+
+        * inspector/agents/InspectorDebuggerAgent.cpp:
+        (Inspector::InspectorDebuggerAgent::didBecomeIdle):
+        When resuming after becoming idle, be sure to clear Debugger state.
+
 2017-01-03  JF Bastien  <[email protected]>
 
         WebAssembly JS API: check and test in-call / out-call values

Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (210250 => 210251)


--- trunk/Source/_javascript_Core/debugger/Debugger.cpp	2017-01-03 22:31:22 UTC (rev 210250)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp	2017-01-03 22:31:25 UTC (rev 210251)
@@ -612,10 +612,11 @@
 
 void Debugger::continueProgram()
 {
+    clearNextPauseState();
+
     if (!m_isPaused)
         return;
 
-    m_pauseAtNextOpportunity = false;
     notifyDoneProcessingDebuggerEvents();
 }
 

Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (210250 => 210251)


--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp	2017-01-03 22:31:22 UTC (rev 210250)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp	2017-01-03 22:31:25 UTC (rev 210251)
@@ -787,8 +787,11 @@
 {
     m_registeredIdleCallback = false;
 
-    if (m_conditionToDispatchResumed == ShouldDispatchResumed::WhenIdle)
+    if (m_conditionToDispatchResumed == ShouldDispatchResumed::WhenIdle) {
+        cancelPauseOnNextStatement();
+        m_scriptDebugServer.continueProgram();
         m_frontendDispatcher->resumed();
+    }
 
     m_conditionToDispatchResumed = ShouldDispatchResumed::No;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to