Title: [86963] trunk/Source/WebCore
- Revision
- 86963
- Author
- [email protected]
- Date
- 2011-05-20 09:25:31 -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 (86962 => 86963)
--- trunk/Source/WebCore/ChangeLog 2011-05-20 16:20:24 UTC (rev 86962)
+++ trunk/Source/WebCore/ChangeLog 2011-05-20 16:25:31 UTC (rev 86963)
@@ -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 Sheriff Bot <[email protected]>
Unreviewed, rolling out r86958.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (86962 => 86963)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 16:20:24 UTC (rev 86962)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 16:25:31 UTC (rev 86963)
@@ -67,7 +67,10 @@
WebInspector.DebuggerPresentationModel.prototype = {
_debuggerWasEnabled: function()
{
+ if (this._breakpointsRestored)
+ return;
this._restoreBreakpointsFromSettings();
+ this._breakpointsRestored = true;
},
sourceFile: function(sourceFileId)
@@ -507,8 +510,15 @@
serializedBreakpoints = serializedBreakpoints.concat(this._breakpointsWithoutSourceFile[sourceFileId]);
// Sanitize debugger ids.
- for (var i = 0; i < serializedBreakpoints.length; ++i)
- delete serializedBreakpoints[i].debuggerId;
+ for (var i = 0; i < serializedBreakpoints.length; ++i) {
+ var breakpoint = serializedBreakpoints[i];
+ var breakpointCopy = {};
+ for (var property in breakpoint) {
+ if (property !== "debuggerId")
+ breakpointCopy[property] = breakpoint[property];
+ }
+ serializedBreakpoints[i] = breakpointCopy;
+ }
WebInspector.settings.breakpoints = serializedBreakpoints;
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
