Changeset 133248 in webkit

Timestamp:

Nov 1, 2012 6:19:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix assertion failure in RenderGeometryMap::absoluteRect when frame scale != 1.0
​https://bugs.webkit.org/show_bug.cgi?id=100912

Patch by Tien-Ren Chen <​trchen@chromium.org> on 2012-11-01
Reviewed by Simon Fraser.

Frame scale will add transformation to RenderView, so fixed position doesn't
get propagated up to the viewport by RenderGeometryMap. This is handled
correctly in RenderView::mapLocalToContainer, causing the assertion to fail.
This patch corrects RenderGeometryMap::mapToAbsolute to handle the RenderView
transformation case.

A layout test is added to catch this issue. The test will crash debug build
without this patch.

Source/WebCore:

Test: compositing/geometry/fixed-position-composited-page-scale-scroll.html

• rendering/RenderGeometryMap.cpp:

(WebCore::RenderGeometryMap::mapToAbsolute):

LayoutTests:

• compositing/geometry/fixed-position-composited-page-scale-scroll-expected.txt: Added.
• compositing/geometry/fixed-position-composited-page-scale-scroll.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/geometry/fixed-position-composited-page-scale-scroll-expected.txt (added)
• LayoutTests/compositing/geometry/fixed-position-composited-page-scale-scroll.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGeometryMap.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-01  Tien-Ren Chen  <trchen@chromium.org>
+
+        Fix assertion failure in RenderGeometryMap::absoluteRect when frame scale != 1.0
+        https://bugs.webkit.org/show_bug.cgi?id=100912
+
+        Reviewed by Simon Fraser.
+
+        Frame scale will add transformation to RenderView, so fixed position doesn't
+        get propagated up to the viewport by RenderGeometryMap. This is handled
+        correctly in RenderView::mapLocalToContainer, causing the assertion to fail.
+        This patch corrects RenderGeometryMap::mapToAbsolute to handle the RenderView
+        transformation case.
+
+        A layout test is added to catch this issue. The test will crash debug build
+        without this patch.
+
+
+        * compositing/geometry/fixed-position-composited-page-scale-scroll-expected.txt: Added.
+        * compositing/geometry/fixed-position-composited-page-scale-scroll.html: Added.
+
 2012-11-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-01  Tien-Ren Chen  <trchen@chromium.org>
+
+        Fix assertion failure in RenderGeometryMap::absoluteRect when frame scale != 1.0
+        https://bugs.webkit.org/show_bug.cgi?id=100912
+
+        Reviewed by Simon Fraser.
+
+        Frame scale will add transformation to RenderView, so fixed position doesn't
+        get propagated up to the viewport by RenderGeometryMap. This is handled
+        correctly in RenderView::mapLocalToContainer, causing the assertion to fail.
+        This patch corrects RenderGeometryMap::mapToAbsolute to handle the RenderView
+        transformation case.
+
+        A layout test is added to catch this issue. The test will crash debug build
+        without this patch.
+
+        Test: compositing/geometry/fixed-position-composited-page-scale-scroll.html
+
+        * rendering/RenderGeometryMap.cpp:
+        (WebCore::RenderGeometryMap::mapToAbsolute):
+
 2012-11-01  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderGeometryMap.cpp

@@ -105 +105 @@
         // for fixed descendants, which prevents the propagation of 'fixed'
         // unless the layer itself is also fixed position.
-        if (currentStep.m_hasTransform && !currentStep.m_isFixedPosition)
+        if (i && currentStep.m_hasTransform && !currentStep.m_isFixedPosition)
             inFixed = false;
         else if (currentStep.m_isFixedPosition)