Title: [86961] trunk/Source/WebCore
- Revision
- 86961
- Author
- [email protected]
- Date
- 2011-05-20 09:20:13 -0700 (Fri, 20 May 2011)
Log Message
2011-05-20 Sheriff Bot <[email protected]>
Unreviewed, rolling out r86958.
http://trac.webkit.org/changeset/86958
https://bugs.webkit.org/show_bug.cgi?id=61195
broke breakpoints persisting (Requested by podivilov on
#webkit).
* inspector/front-end/DebuggerPresentationModel.js:
(WebInspector.DebuggerPresentationModel.prototype._debuggerWasEnabled):
(WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (86960 => 86961)
--- trunk/Source/WebCore/ChangeLog 2011-05-20 16:19:38 UTC (rev 86960)
+++ trunk/Source/WebCore/ChangeLog 2011-05-20 16:20:13 UTC (rev 86961)
@@ -1,3 +1,16 @@
+2011-05-20 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r86958.
+ http://trac.webkit.org/changeset/86958
+ https://bugs.webkit.org/show_bug.cgi?id=61195
+
+ broke breakpoints persisting (Requested by podivilov on
+ #webkit).
+
+ * inspector/front-end/DebuggerPresentationModel.js:
+ (WebInspector.DebuggerPresentationModel.prototype._debuggerWasEnabled):
+ (WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints):
+
2011-05-19 Sergey Vorobyev <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js (86960 => 86961)
--- trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 16:19:38 UTC (rev 86960)
+++ trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js 2011-05-20 16:20:13 UTC (rev 86961)
@@ -67,10 +67,7 @@
WebInspector.DebuggerPresentationModel.prototype = {
_debuggerWasEnabled: function()
{
- if (this._breakpointsRestored)
- return;
this._restoreBreakpointsFromSettings();
- this._breakpointsRestored = true;
},
sourceFile: function(sourceFileId)
@@ -506,19 +503,13 @@
}
// Store not added breakpoints.
- 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);
- }
- }
+ for (var sourceFileId in this._breakpointsWithoutSourceFile)
+ serializedBreakpoints = serializedBreakpoints.concat(this._breakpointsWithoutSourceFile[sourceFileId]);
+ // 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
