Title: [112379] trunk
- Revision
- 112379
- Author
- podivi...@chromium.org
- Date
- 2012-03-28 02:58:07 -0700 (Wed, 28 Mar 2012)
Log Message
Web Inspector: breakpoints are not shown in sidebar pane after reload.
https://bugs.webkit.org/show_bug.cgi?id=82351
Reviewed by Pavel Feldman.
Source/WebCore:
When UISourceCode is added to ScriptsPanel, it could already have breakpoints.
We should iterate over existing breakpoints and add them to sidebar pane.
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._uiSourceCodeAdded):
LayoutTests:
* inspector/debugger/set-breakpoint-expected.txt:
* inspector/debugger/set-breakpoint.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (112378 => 112379)
--- trunk/LayoutTests/ChangeLog 2012-03-28 09:56:36 UTC (rev 112378)
+++ trunk/LayoutTests/ChangeLog 2012-03-28 09:58:07 UTC (rev 112379)
@@ -1,3 +1,13 @@
+2012-03-28 Pavel Podivilov <podivi...@chromium.org>
+
+ Web Inspector: breakpoints are not shown in sidebar pane after reload.
+ https://bugs.webkit.org/show_bug.cgi?id=82351
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/debugger/set-breakpoint-expected.txt:
+ * inspector/debugger/set-breakpoint.html:
+
2012-03-28 Kristóf Kosztyó <kkris...@inf.u-szeged.hu>
[Qt] REGRESSION(r111480): It made svg/as-image tests assert
Modified: trunk/LayoutTests/inspector/debugger/set-breakpoint-expected.txt (112378 => 112379)
--- trunk/LayoutTests/inspector/debugger/set-breakpoint-expected.txt 2012-03-28 09:56:36 UTC (rev 112378)
+++ trunk/LayoutTests/inspector/debugger/set-breakpoint-expected.txt 2012-03-28 09:58:07 UTC (rev 112379)
@@ -8,6 +8,14 @@
Script execution paused.
Call stack:
0) testFunction (set-breakpoint.html:17)
+
+Dump breakpoint sidebar pane:
+
+ set-breakpoint.html:17
+ var x = Math.sqrt(10);
+
+Dump breakpoint sidebar pane:
+
Script execution resumed.
Running: testSetBreakpointOnTheLastLine
Modified: trunk/LayoutTests/inspector/debugger/set-breakpoint.html (112378 => 112379)
--- trunk/LayoutTests/inspector/debugger/set-breakpoint.html 2012-03-28 09:56:36 UTC (rev 112378)
+++ trunk/LayoutTests/inspector/debugger/set-breakpoint.html 2012-03-28 09:58:07 UTC (rev 112379)
@@ -39,6 +39,7 @@
{
InspectorTest.addResult("Script execution paused.");
InspectorTest.captureStackTrace(callFrames);
+ dumpBreakpointSidebarPane()
InspectorTest.addSniffer(currentSourceFrame, "removeBreakpoint", breakpointRemoved);
InspectorTest.removeBreakpoint(currentSourceFrame, 16);
}
@@ -50,6 +51,7 @@
function didResume()
{
+ dumpBreakpointSidebarPane()
InspectorTest.addResult("Script execution resumed.");
next();
}
@@ -114,6 +116,14 @@
}
}
]);
+
+ function dumpBreakpointSidebarPane()
+ {
+ var paneElement = WebInspector.panels.scripts.sidebarPanes.jsBreakpoints.listElement
+ InspectorTest.addResult("");
+ InspectorTest.addResult("Dump breakpoint sidebar pane:");
+ InspectorTest.addResult(InspectorTest.textContentWithLineBreaks(paneElement));
+ }
}
</script>
Modified: trunk/Source/WebCore/ChangeLog (112378 => 112379)
--- trunk/Source/WebCore/ChangeLog 2012-03-28 09:56:36 UTC (rev 112378)
+++ trunk/Source/WebCore/ChangeLog 2012-03-28 09:58:07 UTC (rev 112379)
@@ -1,3 +1,16 @@
+2012-03-28 Pavel Podivilov <podivi...@chromium.org>
+
+ Web Inspector: breakpoints are not shown in sidebar pane after reload.
+ https://bugs.webkit.org/show_bug.cgi?id=82351
+
+ Reviewed by Pavel Feldman.
+
+ When UISourceCode is added to ScriptsPanel, it could already have breakpoints.
+ We should iterate over existing breakpoints and add them to sidebar pane.
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._uiSourceCodeAdded):
+
2012-03-28 Li Yin <li....@intel.com>
[WebSocket]The Sec-WebSocket-Protocol must not appear more than once in an HTTP response
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (112378 => 112379)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-03-28 09:56:36 UTC (rev 112378)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-03-28 09:58:07 UTC (rev 112379)
@@ -256,6 +256,10 @@
_uiSourceCodeAdded: function(event)
{
var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
+
+ var breakpoints = uiSourceCode.breakpoints();
+ for (var lineNumber in breakpoints)
+ this._uiBreakpointAdded({ data: breakpoints[lineNumber] });
this._addBreakpointListeners(uiSourceCode);
if (!uiSourceCode.url || uiSourceCode.isSnippetEvaluation) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
