Changeset 147322 in webkit

Timestamp:

Apr 1, 2013 5:52:13 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [DTE] Convertion between text and coordinates
​https://bugs.webkit.org/show_bug.cgi?id=113389

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

Source/WebCore:

Test: inspector/editor/text-editor-char-to-coordinates.html

Implement cursorPositionToCoordinates and coordinatesToCursorPosition
methods pair in DefaultTextEditor.

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.DefaultTextEditor.prototype.cursorPositionToCoordinates):
(WebInspector.DefaultTextEditor.prototype.coordinatesToCursorPosition):
(WebInspector.TextEditorMainPanel.prototype.cursorPositionToCoordinates):
(WebInspector.TextEditorMainPanel.prototype.coordinatesToCursorPosition):

• inspector/front-end/TextEditor.js:

(WebInspector.TextEditor.prototype.cursorPositionToCoordinates):
(WebInspector.TextEditor.prototype.coordinatesToCursorPosition):

LayoutTests:

Test to verify added functionality.

• inspector/editor/text-editor-char-to-coordinates-expected.txt: Added.
• inspector/editor/text-editor-char-to-coordinates.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-char-to-coordinates-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-char-to-coordinates.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/TextEditor.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-01  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: [DTE] Convertion between text and coordinates
+        https://bugs.webkit.org/show_bug.cgi?id=113389
+
+        Reviewed by Pavel Feldman.
+
+        Test to verify added functionality.
+
+        * inspector/editor/text-editor-char-to-coordinates-expected.txt: Added.
+        * inspector/editor/text-editor-char-to-coordinates.html: Added.
+
 2013-04-01  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-01  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: [DTE] Convertion between text and coordinates
+        https://bugs.webkit.org/show_bug.cgi?id=113389
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/editor/text-editor-char-to-coordinates.html
+
+        Implement cursorPositionToCoordinates and coordinatesToCursorPosition
+        methods pair in DefaultTextEditor.
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.DefaultTextEditor.prototype.cursorPositionToCoordinates):
+        (WebInspector.DefaultTextEditor.prototype.coordinatesToCursorPosition):
+        (WebInspector.TextEditorMainPanel.prototype.cursorPositionToCoordinates):
+        (WebInspector.TextEditorMainPanel.prototype.coordinatesToCursorPosition):
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor.prototype.cursorPositionToCoordinates):
+        (WebInspector.TextEditor.prototype.coordinatesToCursorPosition):
+
 2013-04-01  Sergey Ryazanov  <serya@chromium.org>
 

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

@@ -133 +133 @@
     },
 
+    /*
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{x: number, y: number, height: number}}
+     */
+    cursorPositionToCoordinates: function(lineNumber, column)
+    {
+        return this._mainPanel.cursorPositionToCoordinates(lineNumber, column);
+    },
+
+    /**
+     * @param {number} x
+     * @param {number} y
+     * @return {?WebInspector.TextRange}
+     */
+    coordinatesToCursorPosition: function(x, y)
+    {
+        return this._mainPanel.coordinatesToCursorPosition(x, y);
+    },
+
     /**
      * @param {WebInspector.TextRange} range
@@ -1448 +1468 @@
         }
         return null;
+    },
+
+    /**
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{x: number, y: number, height: number}}
+     */
+    cursorPositionToCoordinates: function(lineNumber, column)
+    {
+        if (lineNumber >= this._textModel.linesCount || lineNumber < 0)
+            return null;
+        var line = this._textModel.line(lineNumber);
+        if (column > line.length || column < 0)
+            return null;
+
+        var chunk = this.chunkForLine(lineNumber);
+        if (!chunk.expanded())
+            return null;
+        var lineRow = chunk.expandedLineRow(lineNumber);
+        var ranges = [{
+            startColumn: column,
+            endColumn: column,
+            token: "measure-cursor-position"
+        }];
+        var selection = this.selection();
+
+        this.beginDomUpdates();
+        this._renderRanges(lineRow, line, ranges);
+        var spans = lineRow.getElementsByClassName("webkit-measure-cursor-position");
+        if (WebInspector.debugDefaultTextEditor)
+            console.assert(spans.length === 0);
+        var totalOffset = spans[0].totalOffset();
+        var height = spans[0].offsetHeight;
+        this._paintLineRows([lineRow]);
+        this.endDomUpdates();
+
+        this._restoreSelection(selection);
+        return {
+            x: totalOffset.left,
+            y: totalOffset.top,
+            height: height
+        };
+    },
+
+    /**
+     * @param {number} x
+     * @param {number} y
+     * @return {?WebInspector.TextRange}
+     */
+    coordinatesToCursorPosition: function(x, y)
+    {
+        var element = document.elementFromPoint(x, y);
+        if (!element)
+            return null;
+        var lineRow = element.enclosingNodeOrSelfWithClass("webkit-line-content");
+        if (!lineRow)
+            return null;
+
+        var line = this._textModel.line(lineRow.lineNumber) + " ";
+        var ranges = [];
+        const prefix = "character-position-";
+        for(var i = 0; i < line.length; ++i) {
+            ranges.push({
+                startColumn: i,
+                endColumn: i,
+                token: prefix + i
+            });
+        }
+
+        var selection = this.selection();
+
+        this.beginDomUpdates();
+        this._renderRanges(lineRow, line, ranges);
+        var charElement = document.elementFromPoint(x, y);
+        this._paintLineRows([lineRow]);
+        this.endDomUpdates();
+
+        this._restoreSelection(selection);
+        var className = charElement.className;
+        if (className.indexOf(prefix) < 0)
+            return null;
+        var column = parseInt(className.substring(className.indexOf(prefix) + prefix.length), 10);
+
+        return WebInspector.TextRange.createFromLocation(lineRow.lineNumber, column);
     },
 

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

@@ -46 +46 @@
 
     markClean: function() { },
+
+    /*
+     * @param {number} lineNumber
+     * @param {number} column
+     * @return {?{x: number, y: number, height: number}}
+     */
+    cursorPositionToCoordinates: function(lineNumber, column) { },
+
+    /**
+     * @param {number} x
+     * @param {number} y
+     * @return {?WebInspector.TextRange}
+     */
+    coordinatesToCursorPosition: function(x, y) { },
+
     /**
      * @param {number} lineNumber