Changeset 257046 in webkit

Timestamp:

Feb 19, 2020 10:41:20 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERTION FAILED: roundedIntPoint(LayoutPoint(rendererMappedResult)) == result in WebCore::RenderGeometryMap::mapToContainer
​https://bugs.webkit.org/show_bug.cgi?id=151030
<rdar://problem/27711142>

Patch by Jack Lee <Jack Lee> on 2020-02-19
Reviewed by Darin Adler.

Track if m_accumulatedOffset ever becomes saturated, and if so, do not assert on unexpected rendererMappedResult.

Source/WebCore:

Test: fast/layers/geometry-map-saturated-offset-assert.html

• platform/graphics/LayoutSize.h:

(WebCore::LayoutSize::mightBeSaturated const):

• rendering/RenderGeometryMap.cpp:

(WebCore::RenderGeometryMap::mapToContainer const):
(WebCore::RenderGeometryMap::stepInserted):
(WebCore::RenderGeometryMap::stepRemoved):

• rendering/RenderGeometryMap.h:

LayoutTests:

• fast/layers/geometry-map-saturated-offset-assert-expected.txt: Added.
• fast/layers/geometry-map-saturated-offset-assert.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layers/geometry-map-saturated-offset-assert-expected.txt (added)
• LayoutTests/fast/layers/geometry-map-saturated-offset-assert.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/LayoutSize.h (modified) (1 diff)
• Source/WebCore/rendering/RenderGeometryMap.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderGeometryMap.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-02-19  Jack Lee  <shihchieh_lee@apple.com>
+
+        ASSERTION FAILED: roundedIntPoint(LayoutPoint(rendererMappedResult)) == result in WebCore::RenderGeometryMap::mapToContainer
+        https://bugs.webkit.org/show_bug.cgi?id=151030
+        <rdar://problem/27711142>
+
+        Reviewed by Darin Adler.
+
+        Track if m_accumulatedOffset ever becomes saturated, and if so, do not assert on unexpected rendererMappedResult.
+
+        * fast/layers/geometry-map-saturated-offset-assert-expected.txt: Added.
+        * fast/layers/geometry-map-saturated-offset-assert.html: Added.
+
 2020-02-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-19  Jack Lee  <shihchieh_lee@apple.com>
+
+        ASSERTION FAILED: roundedIntPoint(LayoutPoint(rendererMappedResult)) == result in WebCore::RenderGeometryMap::mapToContainer
+        https://bugs.webkit.org/show_bug.cgi?id=151030
+        <rdar://problem/27711142>
+
+        Reviewed by Darin Adler.
+
+        Track if m_accumulatedOffset ever becomes saturated, and if so, do not assert on unexpected rendererMappedResult.
+
+        Test: fast/layers/geometry-map-saturated-offset-assert.html
+
+        * platform/graphics/LayoutSize.h:
+        (WebCore::LayoutSize::mightBeSaturated const):
+        * rendering/RenderGeometryMap.cpp:
+        (WebCore::RenderGeometryMap::mapToContainer const):
+        (WebCore::RenderGeometryMap::stepInserted):
+        (WebCore::RenderGeometryMap::stepRemoved):
+        * rendering/RenderGeometryMap.h:
+
 2020-02-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/graphics/LayoutSize.h

@@ -137 +137 @@
     }
 
+    bool mightBeSaturated() const
+    {
+        return m_width.mightBeSaturated() || m_height.mightBeSaturated();
+    }
+
 private:
     LayoutUnit m_width;

trunk/Source/WebCore/rendering/RenderGeometryMap.cpp

@@ -110 +110 @@
         result = p + roundedIntSize(m_accumulatedOffset);
         // Should convert to a LayoutPoint because of the uniqueness of LayoutUnit::round
-        ASSERT(roundedIntPoint(LayoutPoint(rendererMappedResult)) == result);
+        ASSERT(m_accumulatedOffsetMightBeSaturated || roundedIntPoint(LayoutPoint(rendererMappedResult)) == result);
     } else {
         TransformState transformState(TransformState::ApplyTransformDirection, p);
@@ -266 +266 @@
 {
     // RenderView's offset, is only applied when we have fixed-positions.
-    if (!step.m_renderer->isRenderView())
+    if (!step.m_renderer->isRenderView()) {
         m_accumulatedOffset += step.m_offset;
+#if ASSERT_ENABLED
+        m_accumulatedOffsetMightBeSaturated |= m_accumulatedOffset.mightBeSaturated();
+#endif
+    }
 
     if (step.m_isNonUniform)
@@ -282 +286 @@
 {
     // RenderView's offset, is only applied when we have fixed-positions.
-    if (!step.m_renderer->isRenderView())
+    if (!step.m_renderer->isRenderView()) {
         m_accumulatedOffset -= step.m_offset;
+#if ASSERT_ENABLED
+        m_accumulatedOffsetMightBeSaturated |= m_accumulatedOffset.mightBeSaturated();
+#endif
+    }
 
     if (step.m_isNonUniform) {

trunk/Source/WebCore/rendering/RenderGeometryMap.h

@@ -131 +131 @@
     LayoutSize m_accumulatedOffset;
     MapCoordinatesFlags m_mapCoordinatesFlags;
+#if ASSERT_ENABLED
+    bool m_accumulatedOffsetMightBeSaturated { false };
+#endif
 };