Changeset 122770 in webkit

Timestamp:

Jul 16, 2012 3:17:10 PM (12 years ago)

Author:

Simon Fraser

Message:

Fix compositing layers in columns when in paginated mode
​https://bugs.webkit.org/show_bug.cgi?id=91425

Reviewed by Dave Hyatt.

Source/WebCore:

Enhance a hack that was added to allow composited layers to
display in columns to work for paginated mode, where the
RenderView is renderer with columns.

Test: compositing/columns/composited-in-paginated.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateLayerPosition):

LayoutTests:

Testcase with a composited layer in a paginated document,
that dumps layers.

• compositing/columns/composited-in-paginated-expected.txt: Added.
• compositing/columns/composited-in-paginated.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/columns/composited-in-paginated-expected.txt (added)
• LayoutTests/compositing/columns/composited-in-paginated.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix compositing layers in columns when in paginated mode
+        https://bugs.webkit.org/show_bug.cgi?id=91425
+
+        Reviewed by Dave Hyatt.
+
+        Testcase with a composited layer in a paginated document,
+        that dumps layers.
+
+        * compositing/columns/composited-in-paginated-expected.txt: Added.
+        * compositing/columns/composited-in-paginated.html: Added.
+
 2012-07-16  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix compositing layers in columns when in paginated mode
+        https://bugs.webkit.org/show_bug.cgi?id=91425
+
+        Reviewed by Dave Hyatt.
+
+        Enhance a hack that was added to allow composited layers to
+        display in columns to work for paginated mode, where the
+        RenderView is renderer with columns.
+
+        Test: compositing/columns/composited-in-paginated.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPosition):
+
 2012-07-16  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -843 +843 @@
             // They won't split across columns properly.
             LayoutSize columnOffset;
-            parent()->renderer()->adjustForColumns(columnOffset, localPoint);
+            if (!parent()->renderer()->hasColumns() && parent()->renderer()->isRoot() && renderer()->view()->hasColumns())
+                renderer()->view()->adjustForColumns(columnOffset, localPoint);
+            else
+                parent()->renderer()->adjustForColumns(columnOffset, localPoint);
+
             localPoint += columnOffset;
         }