Changeset 75308 in webkit

Timestamp:

Jan 7, 2011 6:59:58 PM (13 years ago)

Author:

justin.garcia@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=51851
Implement RenderSVGInlineText::localCaretRect()

Reviewed by Dan Bernstein.

WebCore:

• rendering/svg/RenderSVGInlineText.cpp:

(WebCore::RenderSVGInlineText::localCaretRect): Implemented.

LayoutTests:

• svg/text/caret-in-svg-text-expected.txt: Added.
• svg/text/caret-in-svg-text.xhtml: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/text/caret-in-svg-text-expected.txt (added)
• LayoutTests/svg/text/caret-in-svg-text.xhtml (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/svg/RenderSVGInlineText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-07  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51851
+        Implement RenderSVGInlineText::localCaretRect()
+
+        * svg/text/caret-in-svg-text-expected.txt: Added.
+        * svg/text/caret-in-svg-text.xhtml: Added.
+
 2011-01-06  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-07  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51851
+        Implement RenderSVGInlineText::localCaretRect()
+
+        * rendering/svg/RenderSVGInlineText.cpp:
+        (WebCore::RenderSVGInlineText::localCaretRect): Implemented.
+
 2011-01-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/rendering/svg/RenderSVGInlineText.cpp

@@ -93 +93 @@
 }
 
-IntRect RenderSVGInlineText::localCaretRect(InlineBox*, int, int*)
-{
-    return IntRect();
+IntRect RenderSVGInlineText::localCaretRect(InlineBox* box, int caretOffset, int*)
+{
+    if (!box->isInlineTextBox())
+        return IntRect();
+
+    InlineTextBox* textBox = static_cast<InlineTextBox*>(box);
+    if (static_cast<unsigned>(caretOffset) < textBox->start() || static_cast<unsigned>(caretOffset) > textBox->start() + textBox->len())
+        return IntRect();
+
+    // Use the edge of the selection rect to determine the caret rect.
+    if (static_cast<unsigned>(caretOffset) < textBox->start() + textBox->len()) {
+        IntRect rect = textBox->selectionRect(0, 0, caretOffset, caretOffset + 1);
+        int x = box->isLeftToRightDirection() ? rect.x() : rect.right();
+        return IntRect(x, rect.y(), caretWidth, rect.height());
+    }
+
+    IntRect rect = textBox->selectionRect(0, 0, caretOffset - 1, caretOffset);
+    int x = box->isLeftToRightDirection() ? rect.right() : rect.x();
+    return IntRect(x, rect.y(), caretWidth, rect.height());
 }