Title: [86958] trunk/Source/WebCore
- Revision
- 86958
- Author
- [email protected]
- Date
- 2011-05-20 09:11:42 -0700 (Fri, 20 May 2011)
Log Message
2011-05-20 Pavel Podivilov <[email protected]>
Reviewed by Pavel Feldman.
Web Inspector: breakpoints disappear from ui after navigation.
https://bugs.webkit.org/show_bug.cgi?id=61133
* inspector/front-end/DebuggerPresentationModel.js:
(WebInspector.DebuggerPresentationModel.prototype._debuggerWasEnabled):
(WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (86957 => 86958)
--- trunk/Source/WebCore/ChangeLog 2011-05-20 15:55:16 UTC (rev 86957)
+++ trunk/Source/WebCore/ChangeLog 2011-05-20 16:11:42 UTC (rev 86958)
@@ -1,3 +1,14 @@
+2011-05-20 Pavel Podivilov <[email protected]>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: breakpoints disappear from ui after navigation.
+ https://bugs.webkit.org/show_bug.cgi?id=61133
+
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype._debuggerWasEnabled):
+ (WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints):
+
2011-05-20 Jer Noble <[email protected]>
Reviewed by Maciej Stachowiak.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (86957 => 86958)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 15:55:16 UTC (rev 86957)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 16:11:42 UTC (rev 86958)
@@ -67,7 +67,10 @@
WebInspector.DebuggerPresentationModel.prototype = {
_debuggerWasEnabled: function()
{
+ if (this._breakpointsRestored)
+ return;
this._restoreBreakpointsFromSettings();
+ this._breakpointsRestored = true;
},
sourceFile: function(sourceFileId)
@@ -503,13 +506,19 @@
}
// Store not added breakpoints.
- for (var sourceFileId in this._breakpointsWithoutSourceFile)
- serializedBreakpoints = serializedBreakpoints.concat(this._breakpointsWithoutSourceFile[sourceFileId]);
+ for (var sourceFileId in this._breakpointsWithoutSourceFile) {
+ var breakpoints = this._breakpointsWithoutSourceFile[sourceFileId];
+ for (var i = 0; i < breakpoints.length; ++i) {
+ var breakpoint = breakpoints[i];
+ var serializedBreakpoint = {}
+ for (var property in breakpoint) {
+ if (property !== "debuggerId")
+ serializedBreakpoint[property] = breakpoint[property];
+ }
+ serializedBreakpoints.push(serializedBreakpoint);
+ }
+ }
- // Sanitize debugger ids.
- for (var i = 0; i < serializedBreakpoints.length; ++i)
- delete serializedBreakpoints[i].debuggerId;
-
WebInspector.settings.breakpoints = serializedBreakpoints;
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
