Changeset 271738 in webkit

Timestamp:

Jan 21, 2021 10:22:56 PM (18 months ago)

Author:

commit-queue@webkit.org

Message:

Handle shapeMargin becoming NaN
​https://bugs.webkit.org/show_bug.cgi?id=220352

Patch by Rob Buis <​rbuis@igalia.com> on 2021-01-21
Reviewed by Zalan Bujtas.

Source/WebCore:

For large zoom factors shapeMargin can become NaN, in that case treat
it as zero.

Test: fast/shapes/shape-outside-floats/shape-outside-large-zoom.html

• rendering/shapes/ShapeOutsideInfo.cpp:

(WebCore::ShapeOutsideInfo::computedShape const):

LayoutTests:

Add test for this.

• fast/shapes/shape-outside-floats/shape-outside-large-zoom-expected.txt: Added.
• fast/shapes/shape-outside-floats/shape-outside-large-zoom.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-large-zoom-expected.txt (added)
• LayoutTests/fast/shapes/shape-outside-floats/shape-outside-large-zoom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-21  Rob Buis  <rbuis@igalia.com>
+
+        Handle shapeMargin becoming NaN
+        https://bugs.webkit.org/show_bug.cgi?id=220352
+
+        Reviewed by Zalan Bujtas.
+
+        Add test for this.
+
+        * fast/shapes/shape-outside-floats/shape-outside-large-zoom-expected.txt: Added.
+        * fast/shapes/shape-outside-floats/shape-outside-large-zoom.html: Added.
+
 2021-01-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-21  Rob Buis  <rbuis@igalia.com>
+
+        Handle shapeMargin becoming NaN
+        https://bugs.webkit.org/show_bug.cgi?id=220352
+
+        Reviewed by Zalan Bujtas.
+
+        For large zoom factors shapeMargin can become NaN, in that case treat
+        it as zero.
+
+        Test: fast/shapes/shape-outside-floats/shape-outside-large-zoom.html
+
+        * rendering/shapes/ShapeOutsideInfo.cpp:
+        (WebCore::ShapeOutsideInfo::computedShape const):
+
 2021-01-21  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp

@@ -171 +171 @@
 
     WritingMode writingMode = containingBlockStyle.writingMode();
-    float margin = floatValueForLength(m_renderer.style().shapeMargin(), m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : 0_lu);
+    auto margin = [&] {
+        auto shapeMargin = floatValueForLength(m_renderer.style().shapeMargin(), m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : 0_lu);
+        return isnan(shapeMargin) ? 0.0f : shapeMargin;
+    }();
     float shapeImageThreshold = style.shapeImageThreshold();
     const ShapeValue& shapeValue = *style.shapeOutside();