Changeset 196052 in webkit

Timestamp:

Feb 2, 2016 11:01:28 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result)
​https://bugs.webkit.org/show_bug.cgi?id=153576

Patch by Fujii Hironori <​Hironori.Fujii@jp.sony.com> on 2016-02-02
Reviewed by Darin Adler.

Source/WebCore:

Tests: fast/block/geometry-map-assertion-with-rounding-negative-half.html

The results of roundedIntPoint of FloatPoint and LayoutPoint may be different
because of the uniqueness of LayoutUnit::round introduced by this bug
<​https://bugs.webkit.org/show_bug.cgi?id=107208>.
Should convert a FloatPoint to a LayoutPoint before rounding.

• rendering/RenderGeometryMap.cpp:

(WebCore::RenderGeometryMap::mapToContainer):

LayoutTests:

• fast/block/geometry-map-assertion-with-rounding-negative-half-expected.txt: Added.
• fast/block/geometry-map-assertion-with-rounding-negative-half.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/geometry-map-assertion-with-rounding-negative-half-expected.txt (added)
• LayoutTests/fast/block/geometry-map-assertion-with-rounding-negative-half.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGeometryMap.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-02  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
+
+        ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result)
+        https://bugs.webkit.org/show_bug.cgi?id=153576
+
+        Reviewed by Darin Adler.
+
+        * fast/block/geometry-map-assertion-with-rounding-negative-half-expected.txt: Added.
+        * fast/block/geometry-map-assertion-with-rounding-negative-half.html: Added.
+
 2016-02-02  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-02  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
+
+        ASSERTION FAILED: roundedIntPoint(rendererMappedResult) == roundedIntPoint(result)
+        https://bugs.webkit.org/show_bug.cgi?id=153576
+
+        Reviewed by Darin Adler.
+
+        Tests: fast/block/geometry-map-assertion-with-rounding-negative-half.html
+
+        The results of roundedIntPoint of FloatPoint and LayoutPoint may be different
+        because of the uniqueness of LayoutUnit::round introduced by this bug
+        <https://bugs.webkit.org/show_bug.cgi?id=107208>.
+        Should convert a FloatPoint to a LayoutPoint before rounding.
+
+        * rendering/RenderGeometryMap.cpp:
+        (WebCore::RenderGeometryMap::mapToContainer):
+
 2016-02-02  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Source/WebCore/rendering/RenderGeometryMap.cpp

@@ -105 +105 @@
 {
     FloatPoint result;
-    
-    if (!hasFixedPositionStep() && !hasTransformStep() && !hasNonUniformStep() && (!container || (m_mapping.size() && container == m_mapping[0].m_renderer)))
+#if !ASSERT_DISABLED
+    FloatPoint rendererMappedResult = m_mapping.last().m_renderer->localToAbsolute(p, m_mapCoordinatesFlags);
+#endif
+    
+    if (!hasFixedPositionStep() && !hasTransformStep() && !hasNonUniformStep() && (!container || (m_mapping.size() && container == m_mapping[0].m_renderer))) {
         result = p + roundedIntSize(m_accumulatedOffset);
-    else {
+        // Should convert to a LayoutPoint because of the uniqueness of LayoutUnit::round
+        ASSERT(roundedIntPoint(LayoutPoint(rendererMappedResult)) == result);
+    } else {
         TransformState transformState(TransformState::ApplyTransformDirection, p);
         mapToContainer(transformState, container);
         result = transformState.lastPlanarPoint();
-    }
-
-#if !ASSERT_DISABLED
-    FloatPoint rendererMappedResult = m_mapping.last().m_renderer->localToAbsolute(p, m_mapCoordinatesFlags);
-    ASSERT(roundedIntPoint(rendererMappedResult) == roundedIntPoint(result));
-#endif
+        ASSERT(rendererMappedResult == result);
+    }
 
     return result;