Changeset 80347 in webkit

Timestamp:

Mar 4, 2011 6:40:54 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

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

Reviewed by Pavel Feldman.

Web Inspector: [Text editor] Do bisect to find visible chunks
​https://bugs.webkit.org/show_bug.cgi?id=55685

• inspector/front-end/TextViewer.js: (WebInspector.TextEditorChunkedPanel.prototype._chunkNumberForLine): (WebInspector.TextEditorChunkedPanel.prototype._findVisibleChunks): (WebInspector.TextEditorChunkedPanel.prototype._repaintAll): (WebInspector.TextEditorGutterChunk.prototype.get offsetTop): (WebInspector.TextEditorMainPanel.prototype._updateHighlightsForRange): (WebInspector.TextEditorMainChunk.prototype.get offsetTop):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Text editor] Do bisect to find visible chunks
+        https://bugs.webkit.org/show_bug.cgi?id=55685
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextEditorChunkedPanel.prototype._chunkNumberForLine):
+        (WebInspector.TextEditorChunkedPanel.prototype._findVisibleChunks):
+        (WebInspector.TextEditorChunkedPanel.prototype._repaintAll):
+        (WebInspector.TextEditorGutterChunk.prototype.get offsetTop):
+        (WebInspector.TextEditorMainPanel.prototype._updateHighlightsForRange):
+        (WebInspector.TextEditorMainChunk.prototype.get offsetTop):
+
 2011-03-04  Andrey Adaikin  <aandrey@google.com>
 

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

@@ -388 +388 @@
     _chunkNumberForLine: function(lineNumber)
     {
-        // Bisect.
-        var from = 0;
-        var to = this._textChunks.length - 1;
-        while (from < to) {
-            var mid = Math.floor((from + to + 1) / 2);
-            if (this._textChunks[mid].startLine <= lineNumber)
-                from = mid;
-            else
-                to = mid - 1;
-        }
-        return from;
+        function compareLineNumbers(value, chunk)
+        {
+            return value < chunk.startLine ? -1 : 1;
+        }
+        var insertBefore = insertionIndexForObjectInListSortedByFunction(lineNumber, this._textChunks, compareLineNumbers);
+        return insertBefore - 1;
     },
 
@@ -404 +399 @@
     {
         return this._textChunks[this._chunkNumberForLine(lineNumber)];
+    },
+
+    _findVisibleChunks: function(visibleFrom, visibleTo)
+    {
+        function compareOffsetTops(value, chunk)
+        {
+            return value < chunk.offsetTop ? -1 : 1;
+        }
+        var insertBefore = insertionIndexForObjectInListSortedByFunction(visibleFrom, this._textChunks, compareOffsetTops);
+
+        var from = insertBefore - 1;
+        for (var to = from + 1; to < this._textChunks.length; ++to) {
+            if (this._textChunks[to].offsetTop >= visibleTo)
+                break;
+        }
+        return { start: from, end: to };
     },
 
@@ -419 +430 @@
         var visibleTo = this.element.scrollTop + this.element.clientHeight;
 
-        var offset = 0;
-        var fromIndex = -1;
-        var toIndex = 0;
-        for (var i = 0; i < this._textChunks.length; ++i) {
-            var chunk = this._textChunks[i];
-            var chunkHeight = chunk.height;
-            if (offset + chunkHeight > visibleFrom && offset < visibleTo) {
-                if (fromIndex === -1)
-                    fromIndex = i;
-                toIndex = i + 1;
-            } else {
-                if (offset >= visibleTo)
-                    break;
-            }
-            offset += chunkHeight;
-        }
-
-        if (toIndex)
-            this._expandChunks(fromIndex, toIndex);
+        if (visibleTo) {
+            var result = this._findVisibleChunks(visibleFrom, visibleTo);
+            this._expandChunks(result.start, result.end);
+        }
     },
 
@@ -651 +647 @@
             return this._textViewer._totalHeight(this.element);
         return this._textViewer._totalHeight(this._expandedLineRows[0], this._expandedLineRows[this._expandedLineRows.length - 1]);
+    },
+
+    get offsetTop()
+    {
+        return this._expandedLineRows ? this._expandedLineRows[0].offsetTop : this.element.offsetTop;
     },
 
@@ -1342 +1343 @@
         var visibleTo = this.element.scrollTop + this.element.clientHeight;
 
-        var offset = 0;
-        var lastVisibleLine = 0;
-        for (var i = 0; i < this._textChunks.length; ++i) {
-            var chunk = this._textChunks[i];
-            var chunkHeight = chunk.height;
-            if (offset + chunkHeight > visibleFrom && offset < visibleTo)
-                lastVisibleLine = chunk.startLine + chunk.linesCount;
-            else if (offset >= visibleTo)
-                break;
-            offset += chunkHeight;
-        }
+        var result = this._findVisibleChunks(visibleFrom, visibleTo);
+        var chunk = this._textChunks[result.end - 1];
+        var lastVisibleLine = chunk.startLine + chunk.linesCount;
 
         lastVisibleLine = Math.max(lastVisibleLine, range.endLine);
@@ -1528 +1521 @@
     },
 
+    get offsetTop()
+    {
+        return this._expandedLineRows ? this._expandedLineRows[0].offsetTop : this.element.offsetTop;
+    },
+
     _createRow: function(lineNumber)
     {