Changeset 207747 in webkit

Timestamp:

Oct 24, 2016, 12:18:47 AM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r207275. rdar://problem/28810752

Location:

branches/safari-602-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/ruby/rubyrun-has-bad-child-expected.txt (added)
• LayoutTests/fast/ruby/rubyrun-has-bad-child.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRubyRun.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderRubyRun.h (modified) (1 diff)

branches/safari-602-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r207275. rdar://problem/28810752
+
+    2016-10-12  Zalan Bujtas  <zalan@apple.com>
+
+            RenderRubyRun should not mark child renderers dirty at the end of layout.
+            https://bugs.webkit.org/show_bug.cgi?id=163359
+            <rdar://problem/28711840>
+
+            Reviewed by David Hyatt.
+
+            * fast/ruby/rubyrun-has-bad-child-expected.txt: Added.
+            * fast/ruby/rubyrun-has-bad-child.html: Added.
+
 2016-10-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-20  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r207275. rdar://problem/28810752
+
+    2016-10-12  Zalan Bujtas  <zalan@apple.com>
+
+            RenderRubyRun should not mark child renderers dirty at the end of layout.
+            https://bugs.webkit.org/show_bug.cgi?id=163359
+            <rdar://problem/28711840>
+
+            Reviewed by David Hyatt.
+
+            The current layout logic does not support marking renderers dirty for subsequent layouts.
+            Layout needs to exit with a clean tree.
+            Should relayoutChild be insufficient, we could also mark the base/text dirty for the justified content.
+
+            Test: fast/ruby/rubyrun-has-bad-child.html
+
+            * rendering/RenderBlockLineLayout.cpp:
+            (WebCore::RenderBlockFlow::updateRubyForJustifiedText):
+            * rendering/RenderRubyRun.cpp:
+            (WebCore::RenderRubyRun::layout):
+            (WebCore::RenderRubyRun::layoutBlock):
+            * rendering/RenderRubyRun.h:
+
 2016-10-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -582 +582 @@
     r.box()->setExpansion(newRubyRunWidth - r.box()->logicalWidth());
 
-    // This relayout caused the size of the RenderRubyText and the RenderRubyBase to change, dependent on the line's current expansion. Next time we relayout the
-    // RenderRubyRun, make sure that we relayout the RenderRubyBase and RenderRubyText as well.
-    rubyBase.setNeedsLayout(MarkOnlyThis);
-    if (RenderRubyText* rubyText = rubyRun.rubyText())
-        rubyText->setNeedsLayout(MarkOnlyThis);
-
     totalLogicalWidth += totalExpansion;
     expansionOpportunityCount -= totalOpportunitiesInRun;

branches/safari-602-branch/Source/WebCore/rendering/RenderRubyRun.cpp

@@ -236 +236 @@
     if (RenderRubyBase* base = rubyBase())
         base->reset();
-
     RenderBlockFlow::layout();
-    
+}
+
+void RenderRubyRun::layoutBlock(bool relayoutChildren, LayoutUnit pageHeight)
+{
+    if (!relayoutChildren) {
+        // Since the extra relayout in RenderBlockFlow::updateRubyForJustifiedText() causes the size of the RenderRubyText/RenderRubyBase
+        // dependent on the line's current expansion, whenever we relayout the RenderRubyRun, we need to relayout the RenderRubyBase/RenderRubyText as well.
+        // FIXME: We should take the expansion opportunities into account if possible.
+        relayoutChildren = style().textAlign() == JUSTIFY;
+    }
+
+    RenderBlockFlow::layoutBlock(relayoutChildren, pageHeight);
+
     RenderRubyText* rt = rubyText();
     if (!rt)
@@ -244 +255 @@
 
     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();

branches/safari-602-branch/Source/WebCore/rendering/RenderRubyRun.h

@@ -56 +56 @@
     RenderObject* layoutSpecialExcludedChild(bool relayoutChildren) override;
     void layout() override;
+    void layoutBlock(bool relayoutChildren, LayoutUnit pageHeight = 0) override;
 
     bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;