Changeset 116397 in webkit

Timestamp:

May 7, 2012 11:30:35 PM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: do not create locations for resolved provisional breakpoints
​https://bugs.webkit.org/show_bug.cgi?id=85716

Reviewed by Yury Semikhatsky.

Source/WebCore:

Marked provisional breakpoints as such.

• inspector/front-end/BreakpointManager.js:

(WebInspector.BreakpointManager.prototype._debuggerReset):
(WebInspector.BreakpointManager.prototype._breakpointResolved):

LayoutTests:

• inspector/debugger/breakpoint-manager-expected.txt:
• inspector/debugger/breakpoint-manager.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/breakpoint-manager-expected.txt (modified) (3 diffs)
• LayoutTests/inspector/debugger/breakpoint-manager.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/BreakpointManager.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-07  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: do not create locations for resolved provisional breakpoints
+        https://bugs.webkit.org/show_bug.cgi?id=85716
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/debugger/breakpoint-manager-expected.txt:
+        * inspector/debugger/breakpoint-manager.html:
+
 2012-05-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/inspector/debugger/breakpoint-manager-expected.txt

@@ -189 +189 @@
 
   Navigating to B.
+  Resetting debugger.
     breakpointRemoved(a.js, 10)
     Location disposed: a.js:10
@@ -198 +199 @@
 
   Navigating back to A.
+  Resetting debugger.
     breakpointRemoved(b.js, 3)
     Location disposed: b.js:3
+  Resolving provisional breakpoint.
   Adding UISourceCode: a.js (url=a.js)
     debuggerModel.removeBreakpoint(a.js:10)
@@ -252 +255 @@
     debuggerModel.removeBreakpoint(a.js:20)
 
+Running: testProvisionalBreakpointsResolve
+  Created breakpoints manager
+  Dumping Storage
+    a.js:10 enabled:true condition:foo == bar
+  Adding UISourceCode: a.js (url=a.js)
+    debuggerModel.setBreakpoint(a.js:10:foo == bar)
+    breakpointAdded(a.js, 10, foo == bar, true)
+    Location created: a.js:10
+  Resetting debugger.
+    breakpointRemoved(a.js, 10)
+    Location disposed: a.js:10
+  Resolving provisional breakpoint.
+  Dumping Storage
+    a.js:10 enabled:true condition:foo == bar
+  Resetting breakpoint manager
+    debuggerModel.removeBreakpoint(a.js:10)
+

trunk/LayoutTests/inspector/debugger/breakpoint-manager.html

@@ -93 +93 @@
         reset: function()
         {
+            InspectorTest.addResult("  Resetting debugger.");
             this._scripts = {};
             this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.GlobalObjectCleared);
@@ -291 +292 @@
             InspectorTest.addResult("\n  Navigating back to A.");
             breakpointManager._debuggerModel.reset();
-            var eventData = { breakpointId: "a.js:10:0", location: { scriptId: "a.js", lineNumber: 11, columnNumber: 5 }};
+            InspectorTest.addResult("  Resolving provisional breakpoint.");
+            var eventData = { breakpointId: "a.js:10", location: { scriptId: "a.js", lineNumber: 11, columnNumber: 5 }};
             breakpointManager._debuggerModel.dispatchEventToListeners(WebInspector.DebuggerModel.Events.BreakpointResolved, eventData);
             addUISourceCode(breakpointManager, "a.js");
@@ -313 +315 @@
             breakpointManager._debuggerModel.setSourceMapping(defaultMapping);
             resetBreakpointManager(breakpointManager, next);
+        },
+
+        function testProvisionalBreakpointsResolve(next)
+        {
+            var serializedBreakpoints = [];
+            serializedBreakpoints.push(createBreakpoint("a.js", 10, "foo == bar", true));
+
+            var breakpointManager = createBreakpointManager(serializedBreakpoints);
+            var uiSourceCode = addUISourceCode(breakpointManager, "a.js");
+            breakpointManager._debuggerModel.reset();
+            InspectorTest.addResult("  Resolving provisional breakpoint.");
+            var eventData = { breakpointId: "a.js:10", location: { scriptId: "a.js", lineNumber: 11, columnNumber: 5 }};
+            breakpointManager._debuggerModel.dispatchEventToListeners(WebInspector.DebuggerModel.Events.BreakpointResolved, eventData);
+            resetBreakpointManager(breakpointManager, next);
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-07  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: do not create locations for resolved provisional breakpoints
+        https://bugs.webkit.org/show_bug.cgi?id=85716
+
+        Reviewed by Yury Semikhatsky.
+
+        Marked provisional breakpoints as such.
+
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.prototype._debuggerReset):
+        (WebInspector.BreakpointManager.prototype._breakpointResolved):
+
 2012-05-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/inspector/front-end/BreakpointManager.js

@@ -153 +153 @@
     {
         var breakpoints = this._breakpoints.slice();
-        for (var i = 0; i < breakpoints.length; ++i)
+        for (var i = 0; i < breakpoints.length; ++i) {
             breakpoints[i]._resetLocations();
+            breakpoints[i]._isProvisional = true;
+        }
         this._breakpoints = [];
         this._breakpointForUILocation = {};
@@ -165 +167 @@
         var location = /** @type {DebuggerAgent.Location} */ event.data.location;
         var breakpoint = this._breakpointForDebuggerId[breakpointId];
-        if (!breakpoint) {
-            // Provisional breakpoint.
-            return;
-        }
+        if (!breakpoint || breakpoint._isProvisional)
+            return;
         breakpoint._addResolvedLocation(location);
     },