Changeset 141230 in webkit

Timestamp:

Jan 30, 2013 12:05:23 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: DTE adds additional space to the end of line.
​https://bugs.webkit.org/show_bug.cgi?id=108192

Patch by Andrey Lushnikov <​lushnikov@chromium.org> on 2013-01-30
Reviewed by Pavel Feldman.

Append overlay highlight spans before decorations elements and skip
them in _collectLinesFromDom method.

No new tests.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorMainPanel.prototype._appendOverlayHighlight):
(WebInspector.TextEditorMainPanel.prototype._collectLinesFromDOM):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: DTE adds additional space to the end of line.
+        https://bugs.webkit.org/show_bug.cgi?id=108192
+
+        Reviewed by Pavel Feldman.
+
+        Append overlay highlight spans before decorations elements and skip
+        them in _collectLinesFromDom method.
+
+        No new tests.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorMainPanel.prototype._appendOverlayHighlight):
+        (WebInspector.TextEditorMainPanel.prototype._collectLinesFromDOM):
+
 2013-01-29  Shinya Kawanaka  <shinyak@chromium.org>
 

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

@@ -1881 +1881 @@
         for(var i = 0; i < metrics.length; ++i) {
             var highlightSpan = document.createElement("span");
+            highlightSpan._isOverlayHighlightElement = true;
             highlightSpan.addStyleClass(cssClass);
             highlightSpan.style.left = (metrics[i].left - extraWidth) + "px";
@@ -1886 +1887 @@
             highlightSpan.textContent = " ";
             highlightSpan.addStyleClass("text-editor-overlay-highlight");
-            lineRow.appendChild(highlightSpan);
+            lineRow.insertBefore(highlightSpan, lineRow.decorationsElement);
         }
     },
@@ -2574 +2575 @@
         var hasContent = false;
         for (var node = from ? from.nextSibling : this._container; node && node !== to; node = node.traverseNextNode(this._container)) {
-            if (node._isDecorationsElement) {
-                // Skip all children of the decoration container.
+            // Skip all children of the decoration container and overlay highlight spans.
+            while (node && node !== to && (node._isDecorationsElement || node._isOverlayHighlightElement))
                 node = node.nextSibling;
-                if (!node || node === to)
-                    break;
-            }
+            if (!node || node === to)
+                break;
+
             hasContent = true;
             if (node.nodeName.toLowerCase() === "br")