Changeset 163873 in webkit

Timestamp:

Feb 11, 2014 8:12:08 AM (10 years ago)

Author:

stavila@adobe.com

Message:

[CSS Regions] Overflow above the first region is not properly painted for regions with padding
​https://bugs.webkit.org/show_bug.cgi?id=128590

Reviewed by Andrei Bucur.

Source/WebCore:

Painting is done using the layer of the region's container, so offsetting using the content box
of the region itself is incorrect.

Test: fast/regions/region-padding-overflow-hidden.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::regionContainer):
(WebCore::RenderRegion::regionContainerLayer):

• rendering/RenderRegion.h:

LayoutTests:

Added test for the correct painting of overflow above the first region
when the region has padding.

• fast/regions/region-padding-overflow-hidden-expected.html: Added.
• fast/regions/region-padding-overflow-hidden.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/region-padding-overflow-hidden-expected.html (added)
• LayoutTests/fast/regions/region-padding-overflow-hidden.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-02-11  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Overflow above the first region is not properly painted for regions with padding
+        https://bugs.webkit.org/show_bug.cgi?id=128590
+
+        Reviewed by Andrei Bucur.
+
+        Added test for the correct painting of overflow above the first region
+        when the region has padding.
+
+        * fast/regions/region-padding-overflow-hidden-expected.html: Added.
+        * fast/regions/region-padding-overflow-hidden.html: Added.
+
 2014-02-11  Piotr Grad  <p.grad@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-11  Radu Stavila  <stavila@adobe.com>
+
+        [CSS Regions] Overflow above the first region is not properly painted for regions with padding
+        https://bugs.webkit.org/show_bug.cgi?id=128590
+
+        Reviewed by Andrei Bucur.
+
+        Painting is done using the layer of the region's container, so offsetting using the content box
+        of the region itself is incorrect. 
+
+        Test: fast/regions/region-padding-overflow-hidden.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::mapLayerClipRectsToFragmentationLayer):
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::regionContainer):
+        (WebCore::RenderRegion::regionContainerLayer):
+        * rendering/RenderRegion.h:
+
 2014-02-11  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -5248 +5248 @@
 
     LayoutPoint portionLocation = flowThreadPortionRect.location();
-    LayoutRect regionContentBox = region->contentBoxRect();
+    LayoutRect regionContentBox = region->regionContainer()->contentBoxRect();
     LayoutSize moveOffset = portionLocation - regionContentBox.location();
 

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -151 +151 @@
 }
 
+RenderBlockFlow* RenderRegion::regionContainer() const
+{
+    ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());
+    return toRenderBlockFlow(parent());
+}
+
 RenderLayer* RenderRegion::regionContainerLayer() const
 {
-    ASSERT(parent() && parent()->isRenderNamedFlowFragmentContainer());
-    return toRenderBlockFlow(parent())->layer();
+    return regionContainer()->layer();
 }
 

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -58 +58 @@
     LayoutPoint flowThreadPortionLocation() const;
     
+    RenderBlockFlow* regionContainer() const;
     RenderLayer* regionContainerLayer() const;