Changeset 192296 in webkit

Timestamp:

Nov 11, 2015 12:10:06 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r192120 - REGRESSION(r182286): Tatechuyoko following ruby is drawn too far to the right
​https://bugs.webkit.org/show_bug.cgi?id=150923

Reviewed by Zalan Bujtas.

Source/WebCore:

Ever since r182286, expansion opportunities in justified ruby were moved to their neighboring
elements (thereby forbidding trailing nor leading expansions inside ruby). However, when the
neighboring element is tatechuyoko, we will erroneously honor the expansion opportunity inside
the tatechuyoko, thereby moving it horizontally.

Tatechuyoko should never have expansion opportunities inside it.

Test: fast/text/ruby-justify-tatechuyoko.html

• rendering/RenderBlockLineLayout.cpp:

(WebCore::expansionBehaviorForInlineTextBox):

LayoutTests:

• fast/text/ruby-justify-tatechuyoko-expected.html: Added.
• fast/text/ruby-justify-tatechuyoko.html: Added.

Location:

releases/WebKitGTK/webkit-2.10

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/ruby-justify-tatechuyoko-expected.html (added)
• LayoutTests/fast/text/ruby-justify-tatechuyoko.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r182286): Tatechuyoko following ruby is drawn too far to the right
+        https://bugs.webkit.org/show_bug.cgi?id=150923
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/text/ruby-justify-tatechuyoko-expected.html: Added.
+        * fast/text/ruby-justify-tatechuyoko.html: Added.
+
 2015-11-06  Mario Sanchez Prada  <mario@endlessm.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-06  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        REGRESSION(r182286): Tatechuyoko following ruby is drawn too far to the right
+        https://bugs.webkit.org/show_bug.cgi?id=150923
+
+        Reviewed by Zalan Bujtas.
+
+        Ever since r182286, expansion opportunities in justified ruby were moved to their neighboring
+        elements (thereby forbidding trailing nor leading expansions inside ruby). However, when the
+        neighboring element is tatechuyoko, we will erroneously honor the expansion opportunity inside
+        the tatechuyoko, thereby moving it horizontally.
+
+        Tatechuyoko should never have expansion opportunities inside it.
+
+        Test: fast/text/ruby-justify-tatechuyoko.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::expansionBehaviorForInlineTextBox):
+
 2015-11-06  Mario Sanchez Prada  <mario@endlessm.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -720 +720 @@
 static inline ExpansionBehavior expansionBehaviorForInlineTextBox(RenderBlockFlow& block, InlineTextBox& textBox, BidiRun* previousRun, BidiRun* nextRun, ETextAlign textAlign, bool isAfterExpansion)
 {
+    // Tatechuyoko is modeled as the Object Replacement Character (U+FFFC), which can never have expansion opportunities inside nor intrinsically adjacent to it.
+    if (textBox.renderer().style().textCombine() == TextCombineHorizontal)
+        return ForbidLeadingExpansion | ForbidTrailingExpansion;
+
     ExpansionBehavior result = 0;
     bool setLeadingExpansion = false;
     bool setTrailingExpansion = false;
     if (textAlign == JUSTIFY) {
-        // If the next box is ruby, and we're justifying, and the first box in the ruby base has a leading expansion, and we are a text box, then
-        // force a trailing expansion.
+        // If the next box is ruby, and we're justifying, and the first box in the ruby base has a leading expansion, and we are a text box, then force a trailing expansion.
         if (nextRun && is<RenderRubyRun>(nextRun->renderer()) && downcast<RenderRubyRun>(nextRun->renderer()).rubyBase() && nextRun->renderer().style().collapseWhiteSpace()) {
             auto& rubyBase = *downcast<RenderRubyRun>(nextRun->renderer()).rubyBase();