Title: [240108] trunk
- Revision
- 240108
- Author
- za...@apple.com
- Date
- 2019-01-17 08:00:14 -0800 (Thu, 17 Jan 2019)
Log Message
Source/WebCore:
[LFC][BFC] For height computation, the bottom edge of the last line box value should not include top border/padding
https://bugs.webkit.org/show_bug.cgi?id=193520
Reviewed by Antti Koivisto.
This is similar to the other "10.6.3" cases. The bottom edge of the last inline box is in the coordinate systyem
of the containing block's border box (and for content height computation it needs to be mapped to the containing block's content box instead).
* layout/blockformatting/BlockFormattingContextGeometry.cpp:
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
Tools:
[LFC][BFC] For height computation, the bottom edge of the last line box value should include top border/padding
https://bugs.webkit.org/show_bug.cgi?id=193520
Reviewed by Antti Koivisto.
* LayoutReloaded/misc/LFC-passing-tests.txt:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (240107 => 240108)
--- trunk/Source/WebCore/ChangeLog 2019-01-17 13:52:45 UTC (rev 240107)
+++ trunk/Source/WebCore/ChangeLog 2019-01-17 16:00:14 UTC (rev 240108)
@@ -1,3 +1,16 @@
+2019-01-17 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] For height computation, the bottom edge of the last line box value should not include top border/padding
+ https://bugs.webkit.org/show_bug.cgi?id=193520
+
+ Reviewed by Antti Koivisto.
+
+ This is similar to the other "10.6.3" cases. The bottom edge of the last inline box is in the coordinate systyem
+ of the containing block's border box (and for content height computation it needs to be mapped to the containing block's content box instead).
+
+ * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+ (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
+
2019-01-16 Simon Fraser <simon.fra...@apple.com>
Stub out scrolling tree classes for overflow scrolling nodes on macOS
Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp (240107 => 240108)
--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2019-01-17 13:52:45 UTC (rev 240107)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp 2019-01-17 16:00:14 UTC (rev 240108)
@@ -77,7 +77,7 @@
// This is temp and will be replaced by the correct display box once inline runs move over to the display tree.
auto& inlineRuns = downcast<InlineFormattingState>(layoutState.establishedFormattingState(layoutBox)).inlineRuns();
auto bottomEdge = inlineRuns.isEmpty() ? LayoutUnit() : inlineRuns.last().logicalBottom();
- return { bottomEdge, nonCollapsedMargin };
+ return { bottomEdge - borderAndPaddingTop, nonCollapsedMargin };
}
// 2. the bottom edge of the bottom (possibly collapsed) margin of its last in-flow child, if the child's bottom margin...
Modified: trunk/Tools/ChangeLog (240107 => 240108)
--- trunk/Tools/ChangeLog 2019-01-17 13:52:45 UTC (rev 240107)
+++ trunk/Tools/ChangeLog 2019-01-17 16:00:14 UTC (rev 240108)
@@ -1,3 +1,12 @@
+2019-01-17 Zalan Bujtas <za...@apple.com>
+
+ [LFC][BFC] For height computation, the bottom edge of the last line box value should include top border/padding
+ https://bugs.webkit.org/show_bug.cgi?id=193520
+
+ Reviewed by Antti Koivisto.
+
+ * LayoutReloaded/misc/LFC-passing-tests.txt:
+
2019-01-17 Aakash Jain <aakash_j...@apple.com>
[ews-build] unapply-patch step should not update source
Modified: trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt (240107 => 240108)
--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-17 13:52:45 UTC (rev 240107)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt 2019-01-17 16:00:14 UTC (rev 240108)
@@ -90,6 +90,7 @@
fast/block/basic/008.html
fast/block/basic/009.html
fast/block/basic/012.html
+fast/block/basic/021.html
fast/block/basic/child-block-level-box-with-height-percent.html
fast/block/basic/height-percentage-simple.html
fast/block/basic/inline-content-with-floating-image.html
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
