Changeset 195453 in webkit

Timestamp:

Jan 22, 2016 9:35:50 AM (8 years ago)

Author:

hyatt@apple.com

Message:

Elements with overflow and border-radius don't show in multicolumn properly.
​https://bugs.webkit.org/show_bug.cgi?id=152920

Reviewed by Simon Fraser.

Source/WebCore:

Added new test in fast/multicol.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::convertToLayerCoords):
(WebCore::RenderLayer::offsetFromAncestor):
(WebCore::RenderLayer::clipToRect):

• rendering/RenderLayer.h:

Make sure the crawl up the containing block chain to apply clips properly offsets
to account for columns. convertToLayerCoords could already handle this, so
offsetFromAncestor now takes the same extra argument (whether or not to adjust for
columns) that convertToLayerCoords does.

LayoutTests:

• fast/multicol/border-radius-overflow-columns-expected.html: Added.
• fast/multicol/border-radius-overflow-columns.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/border-radius-overflow-columns-expected.html (added)
• LayoutTests/fast/multicol/border-radius-overflow-columns.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderLayer.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-21  Dave Hyatt  <hyatt@apple.com>
+
+        Elements with overflow and border-radius don't show in multicolumn properly.
+        https://bugs.webkit.org/show_bug.cgi?id=152920
+
+        Reviewed by Simon Fraser.
+
+        * fast/multicol/border-radius-overflow-columns-expected.html: Added.
+        * fast/multicol/border-radius-overflow-columns.html: Added.
+
 2016-01-22  ChangSeok Oh  <changseok.oh@collabora.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-21  Dave Hyatt  <hyatt@apple.com>
+
+        Elements with overflow and border-radius don't show in multicolumn properly.
+        https://bugs.webkit.org/show_bug.cgi?id=152920
+
+        Reviewed by Simon Fraser.
+
+        Added new test in fast/multicol.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::convertToLayerCoords):
+        (WebCore::RenderLayer::offsetFromAncestor):
+        (WebCore::RenderLayer::clipToRect):
+        * rendering/RenderLayer.h:
+
+        Make sure the crawl up the containing block chain to apply clips properly offsets
+        to account for columns. convertToLayerCoords could already handle this, so
+        offsetFromAncestor now takes the same extra argument (whether or not to adjust for
+        columns) that convertToLayerCoords does.
+
 2016-01-22  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2130 +2130 @@
 }
 
-LayoutSize RenderLayer::offsetFromAncestor(const RenderLayer* ancestorLayer) const
-{
-    return toLayoutSize(convertToLayerCoords(ancestorLayer, LayoutPoint()));
+LayoutSize RenderLayer::offsetFromAncestor(const RenderLayer* ancestorLayer, ColumnOffsetAdjustment adjustForColumns) const
+{
+    return toLayoutSize(convertToLayerCoords(ancestorLayer, LayoutPoint(), adjustForColumns));
 }
 
@@ -3818 +3818 @@
         for (RenderLayer* layer = rule == IncludeSelfForBorderRadius ? this : parent(); layer; layer = layer->parent()) {
             if (layer->renderer().hasOverflowClip() && layer->renderer().style().hasBorderRadius() && inContainingBlockChain(this, layer)) {
-                LayoutRect adjustedClipRect = LayoutRect(toLayoutPoint(layer->offsetFromAncestor(paintingInfo.rootLayer)), layer->size());
+                LayoutRect adjustedClipRect = LayoutRect(toLayoutPoint(layer->offsetFromAncestor(paintingInfo.rootLayer, AdjustForColumns)), layer->size());
                 adjustedClipRect.move(paintingInfo.subpixelAccumulation);
                 context.clipRoundedRect(layer->renderer().style().getRoundedInnerBorderFor(adjustedClipRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor));

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -437 +437 @@
     void convertToPixelSnappedLayerCoords(const RenderLayer* ancestorLayer, IntPoint& location, ColumnOffsetAdjustment adjustForColumns = DontAdjustForColumns) const;
     LayoutPoint convertToLayerCoords(const RenderLayer* ancestorLayer, const LayoutPoint&, ColumnOffsetAdjustment adjustForColumns = DontAdjustForColumns) const;
-    LayoutSize offsetFromAncestor(const RenderLayer*) const;
+    LayoutSize offsetFromAncestor(const RenderLayer*, ColumnOffsetAdjustment = DontAdjustForColumns) const;
 
     int zIndex() const { return renderer().style().zIndex(); }