Changeset 145451 in webkit

Timestamp:

Mar 11, 2013, 6:12:11 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Ruby text is incorrectly positioned when its writing-mode is changed to vertical after layout is done
​https://bugs.webkit.org/show_bug.cgi?id=96592

Patch by Yuki Sekiguchi <​yuki.sekiguchi@access-company.com> on 2013-03-11
Reviewed by Hajime Morrita.

Source/WebCore:

Fixed logical left of RenderRubyText is not cleared.

This causes trouble when RenderRubyTest is laid out vertically after horizontally.
Horizontal layout set logical top(== y).
Vertical layout don't set logical left(== y).
RenderRubyText::y remain old one.
We clear old RenderRubyText::y at the first part of layout().

Test: fast/writing-mode/ruby-text-logical-left.html

• rendering/RenderRubyRun.cpp:

(WebCore::RenderRubyRun::layout): Reset logicalLeft not to reuse old one.

LayoutTests:

• fast/writing-mode/ruby-text-logical-left-expected.html: Added.
• fast/writing-mode/ruby-text-logical-left.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/ruby-text-logical-left-expected.html (added)
• LayoutTests/fast/writing-mode/ruby-text-logical-left.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderRubyRun.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-11  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
+
+        Ruby text is incorrectly positioned when its writing-mode is changed to vertical after layout is done
+        https://bugs.webkit.org/show_bug.cgi?id=96592
+
+        Reviewed by Hajime Morrita.
+
+        * fast/writing-mode/ruby-text-logical-left-expected.html: Added.
+        * fast/writing-mode/ruby-text-logical-left.html: Added.
+
 2013-03-11  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Yuki Sekiguchi  <yuki.sekiguchi@access-company.com>
+
+        Ruby text is incorrectly positioned when its writing-mode is changed to vertical after layout is done
+        https://bugs.webkit.org/show_bug.cgi?id=96592
+
+        Reviewed by Hajime Morrita.
+
+        Fixed logical left of RenderRubyText is not cleared.
+
+        This causes trouble when RenderRubyTest is laid out vertically after horizontally.
+        Horizontal layout set logical top(== y).
+        Vertical layout don't set logical left(== y).
+        RenderRubyText::y remain old one.
+        We clear old RenderRubyText::y at the first part of layout().
+
+        Test: fast/writing-mode/ruby-text-logical-left.html
+
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::layout): Reset logicalLeft not to reuse old one.
+
 2013-03-11  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
 

trunk/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -234 +234 @@
     RenderBlock::layout();
     
-    // Place the RenderRubyText such that its bottom is flush with the lineTop of the first line of the RenderRubyBase.
     RenderRubyText* rt = rubyText();
     if (!rt)
         return;
+
+    rt->setLogicalLeft(0);
     
+    // Place the RenderRubyText such that its bottom is flush with the lineTop of the first line of the RenderRubyBase.
     LayoutUnit lastLineRubyTextBottom = rt->logicalHeight();
     LayoutUnit firstLineRubyTextTop = 0;