Title: [267596] trunk
- Revision
- 267596
- Author
- [email protected]
- Date
- 2020-09-25 14:47:14 -0700 (Fri, 25 Sep 2020)
Log Message
[LFC][IFC] Incorrect width value is set for partially collapsible trailing space
https://bugs.webkit.org/show_bug.cgi?id=216990
Reviewed by Simon Fraser.
Source/WebCore:
Use the letter-spacing value as the collapsible space.
Test: fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html
* layout/inlineformatting/InlineLine.cpp:
(WebCore::Layout::Line::appendTextContent):
LayoutTests:
* fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html: Added.
* fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (267595 => 267596)
--- trunk/LayoutTests/ChangeLog 2020-09-25 21:43:41 UTC (rev 267595)
+++ trunk/LayoutTests/ChangeLog 2020-09-25 21:47:14 UTC (rev 267596)
@@ -1,5 +1,15 @@
2020-09-25 Zalan Bujtas <[email protected]>
+ [LFC][IFC] Incorrect width value is set for partially collapsible trailing space
+ https://bugs.webkit.org/show_bug.cgi?id=216990
+
+ Reviewed by Simon Fraser.
+
+ * fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html: Added.
+ * fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html: Added.
+
+2020-09-25 Zalan Bujtas <[email protected]>
+
[LFC][MarginCollapsing] Only inflow boxes collapse their quirk margins with their parents
https://bugs.webkit.org/show_bug.cgi?id=216981
Added: trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html (0 => 267596)
--- trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing-expected.html 2020-09-25 21:47:14 UTC (rev 267596)
@@ -0,0 +1,9 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+div {
+ background-color: green;
+ height: 20px;
+ width: 340px;
+}
+</style>
+<div></p>
Added: trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html (0 => 267596)
--- trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html (rev 0)
+++ trunk/LayoutTests/fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html 2020-09-25 21:47:14 UTC (rev 267596)
@@ -0,0 +1,12 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:LayoutFormattingContextEnabled=true internal:LayoutFormattingContextIntegrationEnabled=false ] -->
+<style>
+div {
+ position: absolute;
+ letter-spacing: 5px;
+ background-color: green;
+ color: green;
+ font-family: Ahem;
+ font-size: 10px;
+}
+</style>
+<div>trailing letter-spacing</p>
Modified: trunk/Source/WebCore/ChangeLog (267595 => 267596)
--- trunk/Source/WebCore/ChangeLog 2020-09-25 21:43:41 UTC (rev 267595)
+++ trunk/Source/WebCore/ChangeLog 2020-09-25 21:47:14 UTC (rev 267596)
@@ -1,3 +1,17 @@
+2020-09-25 Zalan Bujtas <[email protected]>
+
+ [LFC][IFC] Incorrect width value is set for partially collapsible trailing space
+ https://bugs.webkit.org/show_bug.cgi?id=216990
+
+ Reviewed by Simon Fraser.
+
+ Use the letter-spacing value as the collapsible space.
+
+ Test: fast/layoutformattingcontext/horizontal-sizing-with-trailing-letter-spacing.html
+
+ * layout/inlineformatting/InlineLine.cpp:
+ (WebCore::Layout::Line::appendTextContent):
+
2020-09-25 James Darpinian <[email protected]>
Fix WEBGL_compressed_texture_s3tc_srgb in WebGL 2
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp (267595 => 267596)
--- trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-09-25 21:43:41 UTC (rev 267595)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineLine.cpp 2020-09-25 21:47:14 UTC (rev 267596)
@@ -316,7 +316,7 @@
// Any non-whitespace, no-trimmable content resets the existing trimmable.
m_trimmableTrailingContent.reset();
if (!formattingContext().layoutState().shouldIgnoreTrailingLetterSpacing() && !inlineTextItem.isWhitespace() && inlineTextItem.style().letterSpacing() > 0)
- m_trimmableTrailingContent.addPartiallyTrimmableContent(m_runs.size() - 1, logicalWidth);
+ m_trimmableTrailingContent.addPartiallyTrimmableContent(m_runs.size() - 1, inlineTextItem.style().letterSpacing());
}
void Line::appendNonReplacedInlineBox(const InlineItem& inlineItem, InlineLayoutUnit logicalWidth)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
