Title: [256827] trunk
Revision
256827
Author
za...@apple.com
Date
2020-02-18 06:57:53 -0800 (Tue, 18 Feb 2020)

Log Message

[LFC][TreeBuilding] Take createLineBreakBox's return value
https://bugs.webkit.org/show_bug.cgi?id=207879
<rdar://problem/59537585>

Reviewed by Antti Koivisto.

Source/WebCore:

Test: fast/layoutformattingcontext/br-in-inline-content-simple.html

* layout/layouttree/LayoutTreeBuilder.cpp:
(WebCore::Layout::TreeBuilder::createLayoutBox):

LayoutTests:

* fast/layoutformattingcontext/br-in-inline-content-simple-expected.html: Added.
* fast/layoutformattingcontext/br-in-inline-content-simple.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (256826 => 256827)


--- trunk/LayoutTests/ChangeLog	2020-02-18 14:47:47 UTC (rev 256826)
+++ trunk/LayoutTests/ChangeLog	2020-02-18 14:57:53 UTC (rev 256827)
@@ -1,3 +1,14 @@
+2020-02-18  Zalan Bujtas  <za...@apple.com>
+
+        [LFC][TreeBuilding] Take createLineBreakBox's return value
+        https://bugs.webkit.org/show_bug.cgi?id=207879
+        <rdar://problem/59537585>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/br-in-inline-content-simple-expected.html: Added.
+        * fast/layoutformattingcontext/br-in-inline-content-simple.html: Added.
+
 2020-02-17  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Selection cannot be modified via text interaction in some areas of the compose body field in Gmail

Added: trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple-expected.html (0 => 256827)


--- trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple-expected.html	2020-02-18 14:57:53 UTC (rev 256827)
@@ -0,0 +1,2 @@
+<!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<div style="border: 1px solid green; width: 200px; height: 200px;"></div>
\ No newline at end of file

Added: trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple.html (0 => 256827)


--- trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple.html	                        (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/br-in-inline-content-simple.html	2020-02-18 14:57:53 UTC (rev 256827)
@@ -0,0 +1,2 @@
+<!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<div style="border: 1px solid green; width: 200px; height: 200px; color: white">text<br>and<br>some<br>more</div>
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (256826 => 256827)


--- trunk/Source/WebCore/ChangeLog	2020-02-18 14:47:47 UTC (rev 256826)
+++ trunk/Source/WebCore/ChangeLog	2020-02-18 14:57:53 UTC (rev 256827)
@@ -1,3 +1,16 @@
+2020-02-18  Zalan Bujtas  <za...@apple.com>
+
+        [LFC][TreeBuilding] Take createLineBreakBox's return value
+        https://bugs.webkit.org/show_bug.cgi?id=207879
+        <rdar://problem/59537585>
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/layoutformattingcontext/br-in-inline-content-simple.html
+
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::TreeBuilder::createLayoutBox):
+
 2020-02-18  Oriol Brufau  <obru...@igalia.com>
 
         [css-grid] Improve performance of track sizing algorithm for spanning items

Modified: trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp (256826 => 256827)


--- trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2020-02-18 14:47:47 UTC (rev 256826)
+++ trunk/Source/WebCore/layout/layouttree/LayoutTreeBuilder.cpp	2020-02-18 14:57:53 UTC (rev 256827)
@@ -213,7 +213,7 @@
         if (is<RenderLineBreak>(renderer)) {
             clonedStyle.setDisplay(DisplayType::Inline);
             clonedStyle.setFloating(Float::No);
-            createLineBreakBox(downcast<RenderLineBreak>(childRenderer).isWBR(), WTFMove(clonedStyle));
+            childLayoutBox = &createLineBreakBox(downcast<RenderLineBreak>(childRenderer).isWBR(), WTFMove(clonedStyle));
         } else if (is<RenderTable>(renderer)) {
             // Construct the principal table wrapper box (and not the table box itself).
             childLayoutBox = &createContainer(Box::ElementAttributes { Box::ElementType::TableWrapperBox }, WTFMove(clonedStyle));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to