Changeset 140421 in webkit

Timestamp:

Jan 22, 2013, 6:43:38 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: do not highlight really long lines in DTE.
​https://bugs.webkit.org/show_bug.cgi?id=107531

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

Source/WebCore:

Improve TextEditorHighlighter.orderedRangesPerLine method to return
only ranges that start before particular column.

Test: inspector/editor/text-editor-long-line.html

• inspector/front-end/TextEditorHighlighter.js:

(WebInspector.TextEditorHighlighter):
(WebInspector.TextEditorHighlighter.prototype.setHighlightLineLimit):
(WebInspector.TextEditorHighlighter.prototype.orderedRangesPerLine.comparator):
(WebInspector.TextEditorHighlighter.prototype.orderedRangesPerLine):

LayoutTests:

Layout test to verify that Default Text Editor does not spend time for
highlighting really long lines of code.

• inspector/editor/highlighter-long-line.html: Correct highlighter defaults in initialization.
• inspector/editor/text-editor-long-line-expected.txt: Added.
• inspector/editor/text-editor-long-line.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/highlighter-long-line.html (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-long-line-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-long-line.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/TextEditorHighlighter.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-22  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: do not highlight really long lines in DTE.
+        https://bugs.webkit.org/show_bug.cgi?id=107531
+
+        Reviewed by Pavel Feldman.
+
+        Layout test to verify that Default Text Editor does not spend time for
+        highlighting really long lines of code.
+
+        * inspector/editor/highlighter-long-line.html: Correct highlighter defaults in initialization.
+        * inspector/editor/text-editor-long-line-expected.txt: Added.
+        * inspector/editor/text-editor-long-line.html: Added.
+
 2013-01-22  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 

trunk/LayoutTests/inspector/editor/highlighter-long-line.html

@@ -12 +12 @@
     highlighter.mimeType = "text/javascript";
     highlighter.highlightChunkLimit = Number.MAX_VALUE; // Synchronous.
+    highlighter.setHighlightLineLimit(Number.MAX_VALUE);
 
     var src = "/* asdf */ ";

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-22  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: do not highlight really long lines in DTE.
+        https://bugs.webkit.org/show_bug.cgi?id=107531
+
+        Reviewed by Pavel Feldman.
+
+        Improve TextEditorHighlighter.orderedRangesPerLine method to return
+        only ranges that start before particular column.
+
+        Test: inspector/editor/text-editor-long-line.html
+
+        * inspector/front-end/TextEditorHighlighter.js:
+        (WebInspector.TextEditorHighlighter):
+        (WebInspector.TextEditorHighlighter.prototype.setHighlightLineLimit):
+        (WebInspector.TextEditorHighlighter.prototype.orderedRangesPerLine.comparator):
+        (WebInspector.TextEditorHighlighter.prototype.orderedRangesPerLine):
+
 2013-01-22  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 

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

@@ -2058 +2058 @@
             }
 
-            var ranges = this._highlighter.orderedRangesPerLine(lineNumber);
+            var ranges = highlight.ranges;
             this._renderRanges(lineRow, line, ranges);
 

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

@@ -39 +39 @@
     this._damageCallback = damageCallback;
     this._highlightChunkLimit = 1000;
+    this._highlightLineLimit = 500;
 }
 
@@ -57 +58 @@
 
     /**
-     * @param {number} lineNumber
-     * @return {Array.<{startColumn: number, endColumn: number, token: string}>}
+     * @param {number} highlightLineLimit
      */
-    orderedRangesPerLine: function(lineNumber)
-    {
-        var syntaxTokenHighligh = this._textModel.getAttribute(lineNumber, "highlight");
-        if (!syntaxTokenHighligh)
-            return [];
-
-        syntaxTokenHighligh.ranges.sort(function(a, b) {
-            return a.startColumn - b.startColumn;
-        });
-
-        return syntaxTokenHighligh.ranges;
+    setHighlightLineLimit: function(highlightLineLimit)
+    {
+        this._highlightLineLimit = highlightLineLimit;
     },
 
@@ -197 +189 @@
                     var newColumn = this._tokenizer.nextToken(lastHighlightedColumn);
                     var tokenType = this._tokenizer.tokenType;
-                    if (tokenType)
+                    if (tokenType && lastHighlightedColumn < this._highlightLineLimit)
                         state.ranges.push({
                             startColumn: lastHighlightedColumn,