Title: [263853] trunk
- Revision
- 263853
- Author
- [email protected]
- Date
- 2020-07-02 11:56:21 -0700 (Thu, 02 Jul 2020)
Log Message
REGRESSION: Comments section at dpreview has overlapping names with comment on phone
https://bugs.webkit.org/show_bug.cgi?id=213890
Source/WebCore:
<rdar://problem/64693599>
Reviewed by Simon Fraser.
Test: fast/text-autosizing/ios/float-miscomputed-line-height.html
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingValue::adjustTextNodeSizes):
Negative value is used to indicate unset line-height. We shouldn't make adjustments in this case.
This matches Style::BuilderCustom code.
LayoutTests:
Reviewed by Simon Fraser.
* fast/text-autosizing/ios/float-miscomputed-line-height-expected.html: Added.
* fast/text-autosizing/ios/float-miscomputed-line-height.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (263852 => 263853)
--- trunk/LayoutTests/ChangeLog 2020-07-02 18:45:34 UTC (rev 263852)
+++ trunk/LayoutTests/ChangeLog 2020-07-02 18:56:21 UTC (rev 263853)
@@ -1,3 +1,13 @@
+2020-07-02 Antti Koivisto <[email protected]>
+
+ REGRESSION: Comments section at dpreview has overlapping names with comment on phone
+ https://bugs.webkit.org/show_bug.cgi?id=213890
+
+ Reviewed by Simon Fraser.
+
+ * fast/text-autosizing/ios/float-miscomputed-line-height-expected.html: Added.
+ * fast/text-autosizing/ios/float-miscomputed-line-height.html: Added.
+
2020-07-02 Karl Rackler <[email protected]>
Remove expectation for fast/canvas/canvas-radial-gradient-spreadMethod.html as it is passing. Added back imported/w3c/canvas/2d.gradient.radial.cone.bottom.html as it is failing.
Added: trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height-expected.html (0 => 263853)
--- trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height-expected.html 2020-07-02 18:56:21 UTC (rev 263853)
@@ -0,0 +1,13 @@
+<script>
+if (window.internals) {
+ window.internals.settings.setTextAutosizingEnabled(true);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+</script>
+<style>
+.t { font-size: 14px }
+.f { float: left; border: 2px solid red }
+</style>
+<div class=f>float</div>
+<div class=t><span>text</span></div>
+<div class=t>more text</div>
Added: trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height.html (0 => 263853)
--- trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height.html (rev 0)
+++ trunk/LayoutTests/fast/text-autosizing/ios/float-miscomputed-line-height.html 2020-07-02 18:56:21 UTC (rev 263853)
@@ -0,0 +1,13 @@
+<script>
+if (window.internals) {
+ window.internals.settings.setTextAutosizingEnabled(true);
+ window.internals.settings.setTextAutosizingWindowSizeOverride(320, 480);
+}
+</script>
+<style>
+.t { font-size: 14px }
+.f { float: left; border: 2px solid red }
+</style>
+<div class=f>float</div>
+<div class=t>text</div>
+<div class=t>more text</div>
Modified: trunk/Source/WebCore/ChangeLog (263852 => 263853)
--- trunk/Source/WebCore/ChangeLog 2020-07-02 18:45:34 UTC (rev 263852)
+++ trunk/Source/WebCore/ChangeLog 2020-07-02 18:56:21 UTC (rev 263853)
@@ -1,3 +1,19 @@
+2020-07-02 Antti Koivisto <[email protected]>
+
+ REGRESSION: Comments section at dpreview has overlapping names with comment on phone
+ https://bugs.webkit.org/show_bug.cgi?id=213890
+ <rdar://problem/64693599>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/text-autosizing/ios/float-miscomputed-line-height.html
+
+ * rendering/TextAutoSizing.cpp:
+ (WebCore::TextAutoSizingValue::adjustTextNodeSizes):
+
+ Negative value is used to indicate unset line-height. We shouldn't make adjustments in this case.
+ This matches Style::BuilderCustom code.
+
2020-07-02 Zalan Bujtas <[email protected]>
[LFC][BFC] Remove redundant margin-border-padding when computing the intrinsic width
Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (263852 => 263853)
--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2020-07-02 18:45:34 UTC (rev 263852)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2020-07-02 18:56:21 UTC (rev 263853)
@@ -154,7 +154,7 @@
continue;
auto newParentStyle = cloneRenderStyleWithState(parentStyle);
- newParentStyle.setLineHeight(Length(lineHeight, Fixed));
+ newParentStyle.setLineHeight(lineHeightLength.isNegative() ? Length(lineHeightLength) : Length(lineHeight, Fixed));
newParentStyle.setSpecifiedLineHeight(Length { lineHeightLength });
newParentStyle.setFontDescription(WTFMove(fontDescription));
newParentStyle.fontCascade().update(&node->document().fontSelector());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
