Title: [199592] trunk
Revision
199592
Author
[email protected]
Date
2016-04-15 10:18:12 -0700 (Fri, 15 Apr 2016)

Log Message

Web Inspector: Cleanup inspector/debugger tests
https://bugs.webkit.org/show_bug.cgi?id=156619

Reviewed by Brian Burg.

Source/_javascript_Core:

While cleaning up the tests it exposed the fact that breakpoints
were not getting disabled when the inspector closes. This means
that opening the inspector, with breakpoints, and closing the
inspector, would leave the JSC::Debugger thinking breakpoints
are active. The JSC::Debugger should be reset.

* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::disable):

Source/WebInspectorUI:

* UserInterface/Base/Main.js:
(WebInspector.loaded):
* UserInterface/Controllers/DebuggerManager.js:
Remove agent checks for agents that are always available.

LayoutTests:

* inspector/debugger/breakpoint-action-detach.html:
* inspector/debugger/breakpoint-action-with-exception.html:
* inspector/debugger/breakpoint-condition-detach.html:
* inspector/debugger/breakpoint-condition-with-bad-script.html:
* inspector/debugger/breakpoint-condition-with-exception.html:
* inspector/debugger/breakpoint-eval-with-exception.html:
* inspector/debugger/breakpoint-inside-conditons-and-actions.html:
* inspector/debugger/call-frame-function-name.html:
* inspector/debugger/call-frame-this-host.html:
* inspector/debugger/call-frame-this-nonstrict.html:
* inspector/debugger/call-frame-this-strict.html:
* inspector/debugger/debugger-statement.html:
* inspector/debugger/didSampleProbe-multiple-probes.html:
* inspector/debugger/hit-breakpoint-from-console.html:
* inspector/debugger/nested-inspectors.html:
* inspector/debugger/pause-on-assert.html:
* inspector/debugger/regress-133182.html:
* inspector/debugger/removeBreakpoint.html:
* inspector/debugger/setBreakpoint-actions.html:
* inspector/debugger/setBreakpoint-autoContinue.html:
* inspector/debugger/setBreakpoint-column.html:
* inspector/debugger/setBreakpoint-condition.html:
* inspector/debugger/setBreakpoint-dfg-and-modify-local.html:
* inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html:
* inspector/debugger/setBreakpoint-dfg.html:
* inspector/debugger/setBreakpoint-options-exception.html:
* inspector/debugger/setBreakpoint.html:
* inspector/debugger/setBreakpointByUrl-sourceURL.html:
* inspector/debugger/setPauseOnExceptions-all.html:
* inspector/debugger/setPauseOnExceptions-none.html:
* inspector/debugger/setPauseOnExceptions-uncaught.html:
Activate breakpoints in protocol tests that may set breakpoints and pause.
Inspector tests automatically enable breakpoints.

* inspector/debugger/setVariableValue-expected.txt: Removed.
* inspector/debugger/setVariableValue.html: Removed.
* platform/gtk/TestExpectations:
Remove references to bad test. The protocol command no longer exists.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (199591 => 199592)


--- trunk/LayoutTests/ChangeLog	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/ChangeLog	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1,3 +1,49 @@
+2016-04-14  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Cleanup inspector/debugger tests
+        https://bugs.webkit.org/show_bug.cgi?id=156619
+
+        Reviewed by Brian Burg.
+
+        * inspector/debugger/breakpoint-action-detach.html:
+        * inspector/debugger/breakpoint-action-with-exception.html:
+        * inspector/debugger/breakpoint-condition-detach.html:
+        * inspector/debugger/breakpoint-condition-with-bad-script.html:
+        * inspector/debugger/breakpoint-condition-with-exception.html:
+        * inspector/debugger/breakpoint-eval-with-exception.html:
+        * inspector/debugger/breakpoint-inside-conditons-and-actions.html:
+        * inspector/debugger/call-frame-function-name.html:
+        * inspector/debugger/call-frame-this-host.html:
+        * inspector/debugger/call-frame-this-nonstrict.html:
+        * inspector/debugger/call-frame-this-strict.html:
+        * inspector/debugger/debugger-statement.html:
+        * inspector/debugger/didSampleProbe-multiple-probes.html:
+        * inspector/debugger/hit-breakpoint-from-console.html:
+        * inspector/debugger/nested-inspectors.html:
+        * inspector/debugger/pause-on-assert.html:
+        * inspector/debugger/regress-133182.html:
+        * inspector/debugger/removeBreakpoint.html:
+        * inspector/debugger/setBreakpoint-actions.html:
+        * inspector/debugger/setBreakpoint-autoContinue.html:
+        * inspector/debugger/setBreakpoint-column.html:
+        * inspector/debugger/setBreakpoint-condition.html:
+        * inspector/debugger/setBreakpoint-dfg-and-modify-local.html:
+        * inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html:
+        * inspector/debugger/setBreakpoint-dfg.html:
+        * inspector/debugger/setBreakpoint-options-exception.html:
+        * inspector/debugger/setBreakpoint.html:
+        * inspector/debugger/setBreakpointByUrl-sourceURL.html:
+        * inspector/debugger/setPauseOnExceptions-all.html:
+        * inspector/debugger/setPauseOnExceptions-none.html:
+        * inspector/debugger/setPauseOnExceptions-uncaught.html:
+        Activate breakpoints in protocol tests that may set breakpoints and pause.
+        Inspector tests automatically enable breakpoints.
+
+        * inspector/debugger/setVariableValue-expected.txt: Removed.
+        * inspector/debugger/setVariableValue.html: Removed.
+        * platform/gtk/TestExpectations:
+        Remove references to bad test. The protocol command no longer exists.
+
 2016-04-15  John Wilander  <[email protected]>
 
         Refactor WebSockets handshake to use StringView instead of String for header validation.

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-action-detach.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -50,6 +50,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-action-with-exception.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -47,6 +47,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-detach.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -50,6 +50,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-bad-script.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -44,6 +44,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-condition-with-exception.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -46,6 +46,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-eval-with-exception.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -56,6 +56,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-inside-conditons-and-actions.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -60,6 +60,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 }
 </script>
 </head>

Modified: trunk/LayoutTests/inspector/debugger/call-frame-function-name.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/call-frame-function-name.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/call-frame-function-name.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -12,6 +12,7 @@
     // call frame functionNames are what we expect.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-host.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/call-frame-this-host.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-host.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -12,6 +12,7 @@
     // call frame this values are what we expect.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-nonstrict.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -12,6 +12,7 @@
     // call frame this values are what we expect.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/call-frame-this-strict.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -12,6 +12,7 @@
     // call frame this values are what we expect.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/debugger-statement.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/debugger-statement.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/debugger-statement.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -13,6 +13,7 @@
     // and one not inlined.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var breakpointFound = false;
 

Modified: trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/didSampleProbe-multiple-probes.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -7,6 +7,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var samples = [];
     const expectedSampleCount = 4;

Modified: trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/hit-breakpoint-from-console.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/nested-inspectors.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/nested-inspectors.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/nested-inspectors.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -9,6 +9,7 @@
         // This function runs in the second inspector window. We can use this one to debug the first inspector.
 
         InspectorProtocol.sendCommand("Debugger.enable", {});
+        InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
         InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
             InspectorProtocol.checkForError(responseObject);
             ProtocolTest.log("Debugger.setPauseOnExceptions - all");

Modified: trunk/LayoutTests/inspector/debugger/pause-on-assert.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/pause-on-assert.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/pause-on-assert.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
     InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, InspectorProtocol.checkForError);
 
     var step = null;

Modified: trunk/LayoutTests/inspector/debugger/regress-133182.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/regress-133182.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/regress-133182.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -34,6 +34,7 @@
     }
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
     InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
         InspectorProtocol.checkForError(responseObject);
         expectPause = true;

Modified: trunk/LayoutTests/inspector/debugger/removeBreakpoint.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/removeBreakpoint.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/removeBreakpoint.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var breakpointTriggered = 0;
 

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-actions.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -9,6 +9,7 @@
 {
     InspectorProtocol.sendCommand("Console.enable", {});
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var isExpectingLogs = false;
     var isExpectingSounds = false;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-autoContinue.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var allowedToHitBreakpoint = false;
     var breakpointIdentifier = null;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-column.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -12,6 +12,7 @@
     // by running some expressions at that call frame.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-condition.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var inBreakpoint = false;
     var breakpointTriggered = 0;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-and-modify-local.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -13,6 +13,7 @@
     // and one not inlined.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var breakpointId = null;
     var scriptId = 0;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg-callee-and-examine-dfg-local.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -13,6 +13,7 @@
     // and examine a global and local via the DFG frame.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var breakpointId = null;
     var scriptId = 0;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-dfg.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -13,6 +13,7 @@
     // and one not inlined.
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var dfgNonInlinedBreakpointId = null;
     var dfgInlinedBreakpointId = null;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint-options-exception.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -8,6 +8,7 @@
 {
     InspectorProtocol.sendCommand("Console.enable", {});
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     var logsSeen = 0;
     const expectedLogs = 2;

Modified: trunk/LayoutTests/inspector/debugger/setBreakpoint.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpoint.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpoint.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setBreakpointByUrl-sourceURL.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -9,6 +9,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
 
     InspectorProtocol.eventHandler["Debugger.scriptParsed"] = function(messageObject)
     {

Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -101,6 +101,7 @@
 
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
     InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "all"}, function(responseObject) {
         InspectorProtocol.checkForError(responseObject);
         ProtocolTest.log("Debugger.setPauseOnExceptions - all");

Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -6,6 +6,7 @@
 function test()
 {
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
     InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "none"}, function(responseObject) {
         InspectorProtocol.checkForError(responseObject);
         ProtocolTest.log("Debugger.setPauseOnExceptions - none");

Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -79,6 +79,7 @@
 
 
     InspectorProtocol.sendCommand("Debugger.enable", {});
+    InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
     InspectorProtocol.sendCommand("Debugger.setPauseOnExceptions", {state: "uncaught"}, function(responseObject) {
         InspectorProtocol.checkForError(responseObject);
         ProtocolTest.log("Debugger.setPauseOnExceptions - uncaught");

Deleted: trunk/LayoutTests/inspector/debugger/setVariableValue-expected.txt (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setVariableValue-expected.txt	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setVariableValue-expected.txt	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1,4 +0,0 @@
-Closure returns: {"type":"string","value":"ttttrue52013"}
- (expected: 'ttttrue52013')
-Protocol command 'Debugger.setVariableValue' failed
-

Deleted: trunk/LayoutTests/inspector/debugger/setVariableValue.html (199591 => 199592)


--- trunk/LayoutTests/inspector/debugger/setVariableValue.html	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/inspector/debugger/setVariableValue.html	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1,180 +0,0 @@
-<html>
-<head>
-<script type="text/_javascript_" src=""
-<script>
-function test()
-{
-    // A general-purpose engine for sending a sequence of protocol commands.
-    // The clients provide requests and response handlers, while the engine catches
-    // errors and makes sure that once there's nothing to do completeTest() is called.
-    // @param step is an object with command, params and callback fields
-    function runRequestSeries(step) {
-        processStep(step);
-
-        function processStep(s) {
-            try {
-                processStepOrFail(s);
-            } catch (e) {
-                ProtocolTest.log(e.stack);
-                ProtocolTest.completeTest();
-            }
-        }
-
-        function processStepOrFail(s) {
-            if (!s) {
-                ProtocolTest.completeTest();
-                return;
-            }
-            if (!s.command) {
-                // A simple loopback step.
-                var next = s.callback();
-                processStep(next);
-                return;
-            }
-
-            var innerCallback = function(response) {
-                var next;
-                if ("error" in response) {
-                    if (!("errorHandler" in s)) {
-                        // Error message is not logged intentionally, it may be platform-specific.
-                        ProtocolTest.log("Protocol command '" + s.command + "' failed");
-                        ProtocolTest.completeTest();
-                        return;
-                    }
-                    try {
-                        next = s.errorHandler(response.error);
-                    } catch (e) {
-                        ProtocolTest.log(e.stack);
-                        ProtocolTest.completeTest();
-                        return;
-                    }
-                } else {
-                    try {
-                        next = s.callback(response.result);
-                    } catch (e) {
-                        ProtocolTest.log(e.stack);
-                        ProtocolTest.completeTest();
-                        return;
-                    }
-                }
-                processStep(next);
-            }
-            InspectorProtocol.sendCommand(s.command, s.params, innerCallback);
-        }
-    }
-
-    var firstStep = { callback: enableDebugger };
-
-    runRequestSeries(firstStep);
-
-    function enableDebugger() {
-        return { command: "Debugger.enable", params: {}, callback: evalFunction };
-    }
-
-    // Testing function/closure scopes.
-
-    function evalFunction(response) {
-        var _expression_ = "(function(p){var r=5;with({year:2013}){return function Closure(q){return p+q+r+year};}})('ttt')";
-        return { command: "Runtime.evaluate", params: {_expression_: _expression_}, callback: callbackEvalFunction };
-    }
-
-    function callbackEvalFunction(result) {
-        var id = result.result.objectId;
-        if (id === undefined)
-            throw new Error("objectId is expected");
-        return createCheckFunctionStepChain(id);
-    }
-
-    function createCheckFunctionStepChain(functionObjectId) {
-        var params = {
-            objectId: functionObjectId,
-            functionDeclaration: "function(){return this(true);}"
-        };
-        return {
-            command: "Runtime.callFunctionOn", params: params, callback: callbackLogClosureEval
-        };
-
-        function callbackLogClosureEval(result) {
-            ProtocolTest.log("Closure returns: " + JSON.stringify(result.result));
-            ProtocolTest.log(" (expected: 'ttttrue52013')");
-
-            var params = {
-                functionObjectId: functionObjectId,
-                scopeNumber: 1,
-                variableName: "r",
-                newValue: { value: 4 }
-            };
-            return {
-                command: "Debugger.setVariableValue", params: params, callback: setVariableCallback
-            };
-        }
-
-        function setVariableCallback() {
-            ProtocolTest.log("Debugger.setVariableValue OK");
-
-            var params = {
-                objectId: functionObjectId,
-                functionDeclaration: "function(){return this(true);}"
-            };
-            return {
-                command: "Runtime.callFunctionOn", params: params, callback: callbackLogClosureEval2
-            };
-
-        }
-
-        function callbackLogClosureEval2(result) {
-            ProtocolTest.log("Closure returns: " + JSON.stringify(result.result));
-            ProtocolTest.log(" (expected: 'ttttrue42013')");
-
-            var params = {
-                // No target is specified
-                scopeNumber: 1,
-                variableName: "r",
-                newValue: { value: 4 }
-            };
-            return {
-                command: "Debugger.setVariableValue", params: params, errorHandler: setVariableErrorCallback3
-            };
-        }
-
-        function setVariableErrorCallback3(error) {
-            ProtocolTest.log("Expected error: " + JSON.stringify(error));
-
-            var params = {
-                functionObjectId: functionObjectId,
-                scopeNumber: 100, // Wrong scope number
-                variableName: "r",
-                newValue: { value: 4 }
-            };
-            return {
-                command: "Debugger.setVariableValue", params: params, errorHandler: setVariableErrorCallback4
-            };
-        }
-
-        function setVariableErrorCallback4(error) {
-            ProtocolTest.log("Expected error");
-
-            var params = {
-                functionObjectId: functionObjectId,
-                scopeNumber: 1,
-                variableName: "bad", // Wrong variable name
-                newValue: { value: 4 }
-            };
-            return {
-                command: "Debugger.setVariableValue", params: params, errorHandler: setVariableErrorCallback5
-            };
-        }
-
-        function setVariableErrorCallback5(error) {
-            ProtocolTest.log("Expected error");
-
-            // End of test.
-            return;
-        }
-    }
-}
-</script>
-</head>
-<body _onload_="runTest()">
-</body>
-</html>

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (199591 => 199592)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1444,7 +1444,6 @@
 webkit.org/b/122571 inspector/debugger/setBreakpoint-column.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/debugger/setBreakpoint-condition.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/debugger/removeBreakpoint.html [ Timeout Pass ]
-webkit.org/b/122571 inspector/debugger/setVariableValue.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/debugger/call-frame-this-strict.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/dom/request-child-nodes-depth.html [ Timeout Pass ]
 webkit.org/b/122571 inspector/dom/focus.html [ Failure Timeout Pass ]

Modified: trunk/Source/_javascript_Core/ChangeLog (199591 => 199592)


--- trunk/Source/_javascript_Core/ChangeLog	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1,3 +1,19 @@
+2016-04-14  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Cleanup inspector/debugger tests
+        https://bugs.webkit.org/show_bug.cgi?id=156619
+
+        Reviewed by Brian Burg.
+
+        While cleaning up the tests it exposed the fact that breakpoints
+        were not getting disabled when the inspector closes. This means
+        that opening the inspector, with breakpoints, and closing the
+        inspector, would leave the JSC::Debugger thinking breakpoints
+        are active. The JSC::Debugger should be reset.
+
+        * inspector/agents/InspectorDebuggerAgent.cpp:
+        (Inspector::InspectorDebuggerAgent::disable):
+
 2016-04-14  Geoffrey Garen  <[email protected]>
 
         CopiedBlock should be 64kB

Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (199591 => 199592)


--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp	2016-04-15 17:18:12 UTC (rev 199592)
@@ -104,6 +104,9 @@
     m_scriptDebugServer.removeListener(this, isBeingDestroyed);
     clearInspectorBreakpointState();
 
+    if (!isBeingDestroyed)
+        m_scriptDebugServer.deactivateBreakpoints();
+
     ASSERT(m_javaScriptBreakpoints.isEmpty());
 
     if (m_listener)

Modified: trunk/Source/WebInspectorUI/ChangeLog (199591 => 199592)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-04-15 17:18:12 UTC (rev 199592)
@@ -1,5 +1,17 @@
 2016-04-14  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Cleanup inspector/debugger tests
+        https://bugs.webkit.org/show_bug.cgi?id=156619
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded):
+        * UserInterface/Controllers/DebuggerManager.js:
+        Remove agent checks for agents that are always available.
+
+2016-04-14  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: Add a _javascript_ Formatting test for template strings
         https://bugs.webkit.org/show_bug.cgi?id=156600
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (199591 => 199592)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2016-04-15 17:18:12 UTC (rev 199592)
@@ -92,8 +92,7 @@
         InspectorBackend.registerReplayDispatcher(new WebInspector.ReplayObserver);
 
     // Enable agents.
-    if (window.InspectorAgent)
-        InspectorAgent.enable();
+    InspectorAgent.enable();
 
     // Perform one-time tasks.
     WebInspector.CSSCompletions.requestCSSCompletions();
@@ -125,13 +124,12 @@
     this.replayManager = new WebInspector.ReplayManager;
 
     // Enable the Console Agent after creating the singleton managers.
-    if (window.ConsoleAgent)
-        ConsoleAgent.enable();
+    ConsoleAgent.enable();
 
     // Tell the backend we are initialized after all our initialization messages have been sent.
     setTimeout(function() {
         // COMPATIBILITY (iOS 8): Inspector.initialized did not exist yet.
-        if (window.InspectorAgent && InspectorAgent.initialized)
+        if (InspectorAgent.initialized)
             InspectorAgent.initialized();
     }, 0);
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (199591 => 199592)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js	2016-04-15 16:44:14 UTC (rev 199591)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js	2016-04-15 17:18:12 UTC (rev 199592)
@@ -29,8 +29,7 @@
     {
         super();
 
-        if (window.DebuggerAgent)
-            DebuggerAgent.enable();
+        DebuggerAgent.enable();
 
         WebInspector.notifications.addEventListener(WebInspector.Notification.DebugUIEnabledDidChange, this._debugUIEnabledDidChange, this);
 
@@ -79,8 +78,7 @@
             this._temporarilyDisabledBreakpointsRestoreSetting.value = null;
         }
 
-        if (window.DebuggerAgent)
-            DebuggerAgent.setBreakpointsActive(this._breakpointsEnabledSetting.value);
+        DebuggerAgent.setBreakpointsActive(this._breakpointsEnabledSetting.value);
 
         this._updateBreakOnExceptionsState();
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to