Changeset 136225 in webkit

Timestamp:

Nov 30, 2012 4:32:15 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Caret is painted horizontally in vertical writing mode when there are no visible text
​https://bugs.webkit.org/show_bug.cgi?id=102359

Patch by Arpita Bahuguna <​arpitabahuguna@gmail.com> on 2012-11-30
Reviewed by Ryosuke Niwa.

Source/WebCore:

In the vertical writing mode the caret rect on an empty editable box or
an empty line is rendered as per the horizontal writing mode.

This changes though when any text is added; the caret is then displayed
in accordance with the vertical writing mode.

Test: editing/selection/caret-alignment-for-vertical-text.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::localCaretRect):

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::localCaretRectForEmptyElement):
The caret rect should be transposed for the vertical writing mode. Its
width and height values need to be interchanged for it to be oriented
as per the vertical text.

LayoutTests:

• editing/selection/caret-alignment-for-vertical-text-expected.txt: Added.
• editing/selection/caret-alignment-for-vertical-text.html: Added.

Test to verify that the orientation of the caret on an empty vertical text
line or container is same as that for a non-empty container.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/caret-alignment-for-vertical-text-expected.txt (added)
• LayoutTests/editing/selection/caret-alignment-for-vertical-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-30  Arpita Bahuguna  <arpitabahuguna@gmail.com>
+
+        Caret is painted horizontally in vertical writing mode when there are no visible text
+        https://bugs.webkit.org/show_bug.cgi?id=102359
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/selection/caret-alignment-for-vertical-text-expected.txt: Added.
+        * editing/selection/caret-alignment-for-vertical-text.html: Added.
+        Test to verify that the orientation of the caret on an empty vertical text
+        line or container is same as that for a non-empty container.
+
 2012-11-30  Nandor Huszka  <hnandor@inf.u-szeged.hu>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-30  Arpita Bahuguna  <arpitabahuguna@gmail.com>
+
+        Caret is painted horizontally in vertical writing mode when there are no visible text
+        https://bugs.webkit.org/show_bug.cgi?id=102359
+
+        Reviewed by Ryosuke Niwa.
+
+        In the vertical writing mode the caret rect on an empty editable box or
+        an empty line is rendered as per the horizontal writing mode.
+
+        This changes though when any text is added; the caret is then displayed
+        in accordance with the vertical writing mode.
+
+        Test: editing/selection/caret-alignment-for-vertical-text.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::localCaretRect):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::localCaretRectForEmptyElement):
+        The caret rect should be transposed for the vertical writing mode. Its
+        width and height values need to be interchanged for it to be oriented
+        as per the vertical text.
+
 2012-11-30  Sankeerth V S  <sankeerth.vs@samsung.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3625 +3625 @@
     // Move to local coords
     rect.moveBy(-location());
+
+    if (!isHorizontalWritingMode())
+        return rect.transposedRect();
+
     return rect;
 }

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2759 +2759 @@
     LayoutUnit y = paddingTop() + borderTop();
 
-    return LayoutRect(x, y, caretWidth, height);
+    return currentStyle->isHorizontalWritingMode() ? LayoutRect(x, y, caretWidth, height) : LayoutRect(y, x, height, caretWidth);
 }