Changeset 89135 in webkit

Timestamp:

Jun 17, 2011 5:40:35 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-06-16 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: breakpointsWithoutSourceFile values should be a maps, not arrays.
​https://bugs.webkit.org/show_bug.cgi?id=62714

• inspector/front-end/DebuggerPresentationModel.js: (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpoints): (WebInspector.DebuggerPresentationModel.prototype.setFormatSourceFiles): (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpointsFromSettings): (WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints): (WebInspector.DebuggerPresentationModel.prototype._reset):
• inspector/front-end/Settings.js: (WebInspector.Settings): (WebInspector.Settings.prototype._set):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-16  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: breakpointsWithoutSourceFile values should be a maps, not arrays.
+        https://bugs.webkit.org/show_bug.cgi?id=62714
+
+        * inspector/front-end/DebuggerPresentationModel.js:
+        (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpoints):
+        (WebInspector.DebuggerPresentationModel.prototype.setFormatSourceFiles):
+        (WebInspector.DebuggerPresentationModel.prototype._restoreBreakpointsFromSettings):
+        (WebInspector.DebuggerPresentationModel.prototype._saveBreakpoints):
+        (WebInspector.DebuggerPresentationModel.prototype._reset):
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        (WebInspector.Settings.prototype._set):
+
 2011-06-17  Joone Hur  <joone.hur@collabora.co.uk>
 

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

@@ -160 +160 @@
     {
         var pendingBreakpoints = this._breakpointsWithoutSourceFile[sourceFile.id];
-        for (var i = 0; pendingBreakpoints && i < pendingBreakpoints.length; ++i) {
-            var breakpointData = pendingBreakpoints[i];
+        if (!pendingBreakpoints)
+            return;
+        for (var lineNumber in pendingBreakpoints) {
+            var breakpointData = pendingBreakpoints[lineNumber];
             if ("debuggerId" in breakpointData) {
                 var breakpoint = new WebInspector.PresentationBreakpoint(sourceFile, breakpointData.lineNumber, breakpointData.condition, breakpointData.enabled);
@@ -254 +256 @@
         for (var id in this._breakpointsWithoutSourceFile) {
             var breakpoints = this._breakpointsWithoutSourceFile[id];
-            for (var i = 0; i < breakpoints.length; ++i)
-                this._removeBreakpointFromDebugger(breakpoints[i]);
+            for (var lineNumber in breakpoints)
+                this._removeBreakpointFromDebugger(breakpoints[lineNumber]);
         }
 
@@ -522 +524 @@
             var pendingBreakpoints = this._breakpointsWithoutSourceFile[sourceFileId];
             if (!pendingBreakpoints) {
-                pendingBreakpoints = [];
+                pendingBreakpoints = {};
                 this._breakpointsWithoutSourceFile[sourceFileId] = pendingBreakpoints;
             }
-            pendingBreakpoints.push(breakpointData);
+            pendingBreakpoints[breakpointData.lineNumber] = breakpointData;
         }
     },
@@ -544 +546 @@
 
         // 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 lineNumber in breakpoints)
+                serializedBreakpoints.push(breakpoints[lineNumber]);
+        }
 
         // Sanitize debugger ids.
@@ -625 +630 @@
                 var breakpoints = this._breakpointsWithoutSourceFile[sourceFile.id];
                 if (!breakpoints) {
-                    breakpoints = [];
+                    breakpoints = {};
                     this._breakpointsWithoutSourceFile[sourceFile.id] = breakpoints;
                 }
-                breakpoints.push(sourceFile.breakpoints[line].serialize());
+                breakpoints[line] = sourceFile.breakpoints[line].serialize();
             }
         }

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

@@ -80 +80 @@
     this.installApplicationSetting("xhrBreakpoints", []);
 
-    this._migrateSettings();
+    // If there are too many breakpoints in a storage, it is likely due to a recent bug that caused
+    // periodical breakpoints duplication leading to inspector slowness.
+    if (window.localStorage.breakpoints && window.localStorage.breakpoints.length > 500000)
+        delete window.localStorage.breakpoints;
 }
-
-WebInspector.Settings.version = "1";
 
 WebInspector.Settings.prototype = {
@@ -111 +112 @@
         if (window.localStorage != null)
             window.localStorage[key] = JSON.stringify(value);
-    },
-
-    _migrateSettings: function()
-    {
-        if (!window.localStorage)
-            return;
-        var version = localStorage.version;
-        if (version === WebInspector.Settings.version)
-            return;
-
-        var breakpointKeys = ["breakpoints", "eventListenerBreakpoints", "domBreakpoints", "xhrBreakpoints"];
-        for (var i = 0; i < breakpointKeys.length; i++)
-            delete localStorage[breakpointKeys[i]];
-
-        localStorage.version = WebInspector.Settings.version;
     }
 }