Changeset 82824 in webkit

Timestamp:

Apr 4, 2011 5:40:12 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-04-04 Andrey Adaikin <​aandrey@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: Highlighted search tokens would not be shown on long lines in the text viewer
​https://bugs.webkit.org/show_bug.cgi?id=57749

• inspector/front-end/TextViewer.js: (WebInspector.TextEditorMainPanel.prototype.markAndRevealRange): (WebInspector.TextEditorMainPanel.prototype._paintLine):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-04  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Highlighted search tokens would not be shown on long lines in the text viewer
+        https://bugs.webkit.org/show_bug.cgi?id=57749
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextEditorMainPanel.prototype.markAndRevealRange):
+        (WebInspector.TextEditorMainPanel.prototype._paintLine):
+
 2011-04-04  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -775 +775 @@
         if (this._rangeToMark) {
             var markedLine = this._rangeToMark.startLine;
-            this._rangeToMark = null;
-            this._paintLines(markedLine, markedLine + 1);
+            delete this._rangeToMark;
+            // Remove the marked region immediately.
+            if (!this._dirtyLines) {
+                this.beginDomUpdates();
+                var chunk = this.chunkForLine(markedLine);
+                var wasExpanded = chunk.expanded;
+                chunk.expanded = false;
+                chunk.updateCollapsedLineRow();
+                chunk.expanded = wasExpanded;
+                this.endDomUpdates();
+            } else
+                this._paintLines(markedLine, markedLine + 1);
         }
 
@@ -782 +792 @@
             this._rangeToMark = range;
             this.revealLine(range.startLine);
-            this._paintLines(range.startLine, range.startLine + 1);
+            var chunk = this.makeLineAChunk(range.startLine);
+            this._paintLine(chunk.element);
             if (this._markedRangeElement)
                 this._markedRangeElement.scrollIntoViewIfNeeded();
@@ -964 +975 @@
     {
         var lineNumber = lineRow.lineNumber;
-        if (this._dirtyLines || this._scheduledPaintLines || this._paintLinesOperationsCredit < 0) {
+        if (this._dirtyLines) {
             this._schedulePaintLines(lineNumber, lineNumber + 1);
             return;
@@ -971 +982 @@
         this.beginDomUpdates();
         try {
+            if (this._scheduledPaintLines || this._paintLinesOperationsCredit < 0) {
+                this._schedulePaintLines(lineNumber, lineNumber + 1);
+                return;
+            }
+
             var highlight = this._textModel.getAttribute(lineNumber, "highlight");
-            if (!highlight) {
-                if (this._rangeToMark && this._rangeToMark.startLine === lineNumber)
-                    this._markedRangeElement = highlightSearchResult(lineRow, this._rangeToMark.startColumn, this._rangeToMark.endColumn - this._rangeToMark.startColumn);
+            if (!highlight)
                 return;
-            }
 
             lineRow.removeChildren();
@@ -1011 +1024 @@
                 --this._paintLinesOperationsCredit;
             }
-            if (this._rangeToMark && this._rangeToMark.startLine === lineNumber)
-                this._markedRangeElement = highlightSearchResult(lineRow, this._rangeToMark.startColumn, this._rangeToMark.endColumn - this._rangeToMark.startColumn);
             if (lineRow.decorationsElement)
                 lineRow.appendChild(lineRow.decorationsElement);
         } finally {
+            if (this._rangeToMark && this._rangeToMark.startLine === lineNumber)
+                this._markedRangeElement = highlightSearchResult(lineRow, this._rangeToMark.startColumn, this._rangeToMark.endColumn - this._rangeToMark.startColumn);
             this.endDomUpdates();
         }