Changeset 86961 in webkit

Timestamp:

May 20, 2011 9:20:13 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-05-20 Sheriff Bot <​webkit.review.bot@gmail.com>

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DebuggerPresentationModel.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-20  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <sergeyvorobyev@google.com>
 

trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js

@@ -68 +68 @@
     _debuggerWasEnabled: function()
     {
-        if (this._breakpointsRestored)
-            return;
         this._restoreBreakpointsFromSettings();
-        this._breakpointsRestored = true;
     },
 
@@ -507 +504 @@
 
         // 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;