Changeset 53051 in webkit

Timestamp:

Jan 10, 2010 11:06:59 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-01-10 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Do not repaint line numbers while editing within line.

​https://bugs.webkit.org/show_bug.cgi?id=33427

• inspector/front-end/TextEditor.js: (WebInspector.TextEditor.prototype._textChanged): (WebInspector.TextEditor.prototype._selectionChanged): (WebInspector.TextEditor.prototype._repaintAll): (WebInspector.TextEditor.prototype._paintLines): (WebInspector.TextEditor.prototype._paintLinesContinuation): (WebInspector.TextEditor.prototype._paintLineNumbers): (WebInspector.TextEditor.prototype._updateCursor): (WebInspector.TextEditor.prototype._copy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextEditor.js (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-10  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Do not repaint line numbers while editing within line.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33427
+
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor.prototype._textChanged):
+        (WebInspector.TextEditor.prototype._selectionChanged):
+        (WebInspector.TextEditor.prototype._repaintAll):
+        (WebInspector.TextEditor.prototype._paintLines):
+        (WebInspector.TextEditor.prototype._paintLinesContinuation):
+        (WebInspector.TextEditor.prototype._paintLineNumbers):
+        (WebInspector.TextEditor.prototype._updateCursor):
+        (WebInspector.TextEditor.prototype._copy):
+
 2010-01-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/inspector/front-end/TextEditor.js

@@ -145 +145 @@
         this._invalidateHighlight(newRange.startLine);
         this._updateSize(newRange.startLine, Math.max(newRange.endLine, oldRange.endLine));
+        if (oldRange.linesCount !== newRange.linesCount)
+            this._paintLineNumbers();
         this._paint();
     },
@@ -151 +153 @@
     _selectionChanged: function(oldRange, newRange)
     {
+        if (oldRange.isEmpty() && newRange.isEmpty() && oldRange.startLine === newRange.startLine) {
+            // Nothing to repaint.
+            return;
+        }
         this._invalidateLines(oldRange.startLine, oldRange.endLine + 1);
         this._invalidateLines(newRange.startLine, newRange.endLine + 1);
@@ -198 +204 @@
     {
         this._invalidateLines(0, this._textModel.linesCount);
+        this._paintLineNumbers();
         this._paint();
         this._updateCursor(this._selection.endLine, this._selection.endColumn);
@@ -243 +250 @@
             this._ctx.fillStyle = "rgb(255,255,0)";
             var height = (lastLine - firstLine) * this._lineHeight;
-            this._ctx.fillRect(0, this._lineHeight * firstLine - this._scrollTop, this._canvas.width, height);
+            this._ctx.fillRect(this._lineNumberOffset - 1, this._lineHeight * firstLine - this._scrollTop, this._canvas.width - this._lineNumberOffset + 1, height);
             setTimeout(this._paintLinesContinuation.bind(this, firstLine, lastLine), 100);
         } else
@@ -250 +257 @@
 
     _paintLinesContinuation: function(firstLine, lastLine) {
-        // Clear all.
-        var height = (lastLine - firstLine) * this._lineHeight;
-        this._ctx.fillStyle = "rgb(255,255,255)";
-        this._ctx.fillRect(0, this._lineHeight * firstLine - this._scrollTop, this._canvas.width, height);
-
-        lastLine = Math.min(lastLine, this._textModel.linesCount);
-
-        // Paint line numbers and separator.
-        this._ctx.fillStyle = "rgb(235,235,235)";
-        this._ctx.fillRect(this._lineNumberOffset - 2, 0, 1, this._canvas.width);
-        this._ctx.fillStyle = "rgb(155,155,155)";
-        for (var i = firstLine; i < lastLine; ++i)
-           this._ctx.fillText(i + 1, (this._lineNumberDigits - this._decimalDigits(i + 1) + 1) * this._digitWidth, this._lineHeight * (i + 1) - this._scrollTop);
-
         // Clip editor area.
         this._ctx.save();
@@ -269 +262 @@
         this._ctx.rect(this._lineNumberOffset - 1, 0, this._canvas.width - this._lineNumberOffset + 1, this._canvas.height);
         this._ctx.clip();
+
+        // First clear the region, then update last line to fit model (this clears removed lines from the end of the document).
+        var height = (lastLine - firstLine) * this._lineHeight;
+        // Do not clear region when paintCurrentLine is likely to do all the necessary work.
+        if (firstLine + 1 != lastLine || this._selection.endLine != firstLine) {
+            this._ctx.fillStyle = "rgb(255,255,255)";
+            this._ctx.fillRect(0, this._lineHeight * firstLine - this._scrollTop, this._canvas.width, height);
+        }
+        lastLine = Math.min(lastLine, this._textModel.linesCount);
 
         if (this._selection.startLine === this._selection.endLine && firstLine <= this._selection.startLine && this._selection.startLine < lastLine)
@@ -310 +312 @@
         }
         this._ctx.restore();
+    },
+
+    _paintLineNumbers: function()
+    {
+        this._ctx.font = this._font;
+        this._ctx.textBaseline = "bottom";
+
+        this._ctx.fillStyle = "rgb(255,255,255)";
+        this._ctx.fillRect(0, 0, this._lineNumberOffset - 3, this._canvas.height);
+
+        this._ctx.fillStyle = "rgb(235,235,235)";
+        this._ctx.fillRect(this._lineNumberOffset - 2, 0, 1, this._canvas.height);
+
+        var firstLine = Math.min(this._textModel.linesCount, Math.floor(this._scrollTop / this._lineHeight) - 1);
+        var lastLine = Math.min(this._textModel.linesCount, Math.ceil((this._scrollTop + this._canvas.height) / this._lineHeight) + 1);
+
+        this._ctx.fillStyle = "rgb(155,155,155)";
+        for (var i = firstLine; i < lastLine; ++i)
+           this._ctx.fillText(i + 1, (this._lineNumberDigits - this._decimalDigits(i + 1) + 1) * this._digitWidth, this._lineHeight * (i + 1) - this._scrollTop);
     },
 
@@ -550 +571 @@
     _updateCursor: function(line, column)
     {
-        if (line > this._textModel.linesCount)
+        if (line >= this._textModel.linesCount)
             return;
         var offset = this._columnToOffset(line, column);
@@ -623 +644 @@
         e.preventDefault();
         e.clipboardData.clearData();
-        e.clipboardData.setData("text/plain", text);
+        e.clipboardData.setData("Text", text);
     },