Changeset 146875 in webkit

Timestamp:

Mar 26, 2013 6:22:58 AM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Decorations in several consecutive lines are not moved correctly in DTE.
​https://bugs.webkit.org/show_bug.cgi?id=113296

Reviewed by Pavel Feldman.

Separated removing and adding decorations so that moved decorations are not removed when next line is processed.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorGutterPanel.prototype.textChanged):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-26  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Decorations in several consecutive lines are not moved correctly in DTE.
+        https://bugs.webkit.org/show_bug.cgi?id=113296
+
+        Reviewed by Pavel Feldman.
+
+        Separated removing and adding decorations so that moved decorations are not removed when next line is processed.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorGutterPanel.prototype.textChanged):
+
 2013-03-26  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -1088 +1088 @@
 
             // Shift decorations if necessary
+            var decorationsToRestore = {};
             for (var lineNumber in this._decorations) {
                 lineNumber = parseInt(lineNumber, 10);
@@ -1099 +1100 @@
 
                 var lineDecorationsCopy = this._decorations[lineNumber].slice();
-                for (var i = 0; i < lineDecorationsCopy.length; ++i) {
-                    var decoration = lineDecorationsCopy[i];
-                    this.removeDecoration(lineNumber, decoration);
-
-                    // Do not restore the decorations before the end position.
-                    if (lineNumber < oldRange.endLine)
-                        continue;
-
-                    this.addDecoration(lineNumber + linesDiff, decoration);
-                }
+                for (var i = 0; i < lineDecorationsCopy.length; ++i)
+                    this.removeDecoration(lineNumber, lineDecorationsCopy[i]);
+                // Do not restore the decorations before the end position.
+                if (lineNumber >= oldRange.endLine)
+                    decorationsToRestore[lineNumber] = lineDecorationsCopy;
             }
+            for (var lineNumber in decorationsToRestore) {
+                lineNumber = parseInt(lineNumber, 10);
+                var lineDecorationsCopy = decorationsToRestore[lineNumber];
+                for (var i = 0; i < lineDecorationsCopy.length; ++i)
+                    this.addDecoration(lineNumber + linesDiff, lineDecorationsCopy[i]);
+            }
+
 
             this.repaintAll();