Diff
Modified: trunk/LayoutTests/ChangeLog (116396 => 116397)
--- trunk/LayoutTests/ChangeLog 2012-05-08 05:59:34 UTC (rev 116396)
+++ trunk/LayoutTests/ChangeLog 2012-05-08 06:30:35 UTC (rev 116397)
@@ -1,3 +1,13 @@
+2012-05-07 Pavel Feldman <[email protected]>
+
+ 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 <[email protected]>
Compositing layers with transformed children not large enough to show contents
Modified: trunk/LayoutTests/inspector/debugger/breakpoint-manager-expected.txt (116396 => 116397)
--- trunk/LayoutTests/inspector/debugger/breakpoint-manager-expected.txt 2012-05-08 05:59:34 UTC (rev 116396)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-manager-expected.txt 2012-05-08 06:30:35 UTC (rev 116397)
@@ -188,6 +188,7 @@
breakpointAdded(a.js, 20, , false)
Navigating to B.
+ Resetting debugger.
breakpointRemoved(a.js, 10)
Location disposed: a.js:10
breakpointRemoved(a.js, 20)
@@ -197,8 +198,10 @@
Location created: b.js:3
Navigating back to A.
+ Resetting debugger.
breakpointRemoved(b.js, 3)
Location disposed: b.js:3
+ Resolving provisional breakpoint.
Adding UISourceCode: a.js (url=""
debuggerModel.removeBreakpoint(a.js:10)
debuggerModel.setBreakpoint(a.js:10:foo == bar)
@@ -251,3 +254,20 @@
Location disposed: a.js:20
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=""
+ 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)
+
Modified: trunk/LayoutTests/inspector/debugger/breakpoint-manager.html (116396 => 116397)
--- trunk/LayoutTests/inspector/debugger/breakpoint-manager.html 2012-05-08 05:59:34 UTC (rev 116396)
+++ trunk/LayoutTests/inspector/debugger/breakpoint-manager.html 2012-05-08 06:30:35 UTC (rev 116397)
@@ -92,6 +92,7 @@
reset: function()
{
+ InspectorTest.addResult(" Resetting debugger.");
this._scripts = {};
this.dispatchEventToListeners(WebInspector.DebuggerModel.Events.GlobalObjectCleared);
},
@@ -290,7 +291,8 @@
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");
resetBreakpointManager(breakpointManager, next);
@@ -312,6 +314,20 @@
breakpointManager._sourceMapping = defaultMapping;
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);
}
]);
};
Modified: trunk/Source/WebCore/ChangeLog (116396 => 116397)
--- trunk/Source/WebCore/ChangeLog 2012-05-08 05:59:34 UTC (rev 116396)
+++ trunk/Source/WebCore/ChangeLog 2012-05-08 06:30:35 UTC (rev 116397)
@@ -1,3 +1,16 @@
+2012-05-07 Pavel Feldman <[email protected]>
+
+ 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 <[email protected]>
Compositing layers with transformed children not large enough to show contents
Modified: trunk/Source/WebCore/inspector/front-end/BreakpointManager.js (116396 => 116397)
--- trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2012-05-08 05:59:34 UTC (rev 116396)
+++ trunk/Source/WebCore/inspector/front-end/BreakpointManager.js 2012-05-08 06:30:35 UTC (rev 116397)
@@ -152,8 +152,10 @@
_debuggerReset: function()
{
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 = {};
this._uiSourceCodeIds = {};
@@ -164,10 +166,8 @@
var breakpointId = /** @type {DebuggerAgent.BreakpointId} */ event.data.breakpointId;
var location = /** @type {DebuggerAgent.Location} */ event.data.location;
var breakpoint = this._breakpointForDebuggerId[breakpointId];
- if (!breakpoint) {
- // Provisional breakpoint.
+ if (!breakpoint || breakpoint._isProvisional)
return;
- }
breakpoint._addResolvedLocation(location);
},
