<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178029] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178029">178029</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-07 02:22:16 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Border-radius clipping issue on a composited descendants
https://bugs.webkit.org/show_bug.cgi?id=138551
Patch by Byungseon Shin <sun.shin@lge.com> on 2015-01-07
Reviewed by Simon Fraser.
Fix clipping compositing descendants of an accelerated layer having
border radius and clip overflow issue by using layer corner-radius
or a CAShapeLayer mask on Mac, and setting up a separate mask layer
on the childContainmentLayer on other platforms.
This patch is extracted from following Blink revisions:
<http://src.chromium.org/viewvc/blink?view=revision&revision=162463>
<http://src.chromium.org/viewvc/blink?view=revision&revision=158258>
by <rosca@adobe.com>
Clip accelerated descendants of an accelerated layer having border radius and clip overflow.
Large canvas does not honor containing div's border radius.
and <http://src.chromium.org/viewvc/blink?view=revision&revision=160578>
by <junov@chromium.org>
Fix for CSS clip-path with accelerated 2D canvas.
* WebCore.exp.in:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::dumpProperties):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::applyClippingBorder):
(WebCore::GraphicsLayer::clearClippingBorder):
(WebCore::GraphicsLayer::needsClippingMaskLayer):
* platform/graphics/GraphicsLayerClient.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::applyClippingBorder):
(WebCore::GraphicsLayerCA::clearClippingBorder):
* platform/graphics/ca/GraphicsLayerCA.h:
* rendering/PaintPhase.h:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintObject):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintClippingMask):
* rendering/RenderBox.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayerContents):
(WebCore::RenderLayer::paintChildClippingMaskForFragments):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::~RenderLayerBacking):
(WebCore::RenderLayerBacking::destroyGraphicsLayers):
(WebCore::RenderLayerBacking::updateConfiguration):
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::updateChildClippingStrategy):
(WebCore::RenderLayerBacking::setContentsNeedDisplay):
(WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
(WebCore::RenderLayerBacking::paintIntoLayer):
(WebCore::RenderLayerBacking::paintContents):
(WebCore::RenderLayerBacking::backingStoreMemoryEstimate):
* rendering/RenderLayerBacking.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth">trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebCorerenderingPaintPhaseh">trunk/Source/WebCore/rendering/PaintPhase.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2015-01-07 Byungseon Shin <sun.shin@lge.com>
+
+ Fix Border-radius clipping issue on a composited descendants
+ https://bugs.webkit.org/show_bug.cgi?id=138551
+
+ Reviewed by Simon Fraser.
+
+ Fix clipping compositing descendants of an accelerated layer having
+ border radius and clip overflow issue by using layer corner-radius
+ or a CAShapeLayer mask on Mac, and setting up a separate mask layer
+ on the childContainmentLayer on other platforms.
+
+ This patch is extracted from following Blink revisions:
+ <http://src.chromium.org/viewvc/blink?view=revision&revision=162463>
+ <http://src.chromium.org/viewvc/blink?view=revision&revision=158258>
+ by <rosca@adobe.com>
+
+ Clip accelerated descendants of an accelerated layer having border radius and clip overflow.
+ Large canvas does not honor containing div's border radius.
+
+ and <http://src.chromium.org/viewvc/blink?view=revision&revision=160578>
+ by <junov@chromium.org>
+
+ Fix for CSS clip-path with accelerated 2D canvas.
+
+ * WebCore.exp.in:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::dumpProperties):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::applyClippingBorder):
+ (WebCore::GraphicsLayer::clearClippingBorder):
+ (WebCore::GraphicsLayer::needsClippingMaskLayer):
+ * platform/graphics/GraphicsLayerClient.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::applyClippingBorder):
+ (WebCore::GraphicsLayerCA::clearClippingBorder):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * rendering/PaintPhase.h:
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintObject):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintClippingMask):
+ * rendering/RenderBox.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerContents):
+ (WebCore::RenderLayer::paintChildClippingMaskForFragments):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::~RenderLayerBacking):
+ (WebCore::RenderLayerBacking::destroyGraphicsLayers):
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::updateChildClippingStrategy):
+ (WebCore::RenderLayerBacking::setContentsNeedDisplay):
+ (WebCore::RenderLayerBacking::setContentsNeedDisplayInRect):
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+ (WebCore::RenderLayerBacking::paintContents):
+ (WebCore::RenderLayerBacking::backingStoreMemoryEstimate):
+ * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2015-01-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Use HashMap instead of CFDictionary for composite font reference map
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -589,6 +589,8 @@
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setOpacityInternalEf
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setReplicatedLayerEPNS_13GraphicsLayerE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA18setShowDebugBorderEb
</span><ins>+__ZN7WebCore15GraphicsLayerCA19applyClippingBorderERKNS_16FloatRoundedRectE
+__ZN7WebCore15GraphicsLayerCA19clearClippingBorderEv
</ins><span class="cx"> __ZN7WebCore15GraphicsLayerCA19setCustomAppearanceENS_13GraphicsLayer16CustomAppearanceE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA20setChildrenTransformERKNS_20TransformationMatrixE
</span><span class="cx"> __ZN7WebCore15GraphicsLayerCA20setReplicatedByLayerEPNS_13GraphicsLayerE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -761,6 +761,10 @@
</span><span class="cx"> writeIndent(ts, indent + 2);
</span><span class="cx"> ts << "GraphicsLayerPaintMask\n";
</span><span class="cx"> }
</span><ins>+ if (paintingPhase() & GraphicsLayerPaintChildClippingMask) {
+ writeIndent(ts, indent + 2);
+ ts << "GraphicsLayerPaintChildClippingMask\n";
+ }
</ins><span class="cx"> if (paintingPhase() & GraphicsLayerPaintOverflowContents) {
</span><span class="cx"> writeIndent(ts, indent + 2);
</span><span class="cx"> ts << "GraphicsLayerPaintOverflowContents\n";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -368,6 +368,9 @@
</span><span class="cx"> FloatRoundedRect contentsClippingRect() const { return m_contentsClippingRect; }
</span><span class="cx"> virtual void setContentsClippingRect(const FloatRoundedRect& roundedRect) { m_contentsClippingRect = roundedRect; }
</span><span class="cx">
</span><ins>+ virtual bool applyClippingBorder(const FloatRoundedRect&) { return false; }
+ virtual void clearClippingBorder() { return; }
+
</ins><span class="cx"> // Transitions are identified by a special animation name that cannot clash with a keyframe identifier.
</span><span class="cx"> static String animationNameForTransition(AnimatedPropertyID);
</span><span class="cx">
</span><span class="lines">@@ -498,6 +501,8 @@
</span><span class="cx"> virtual bool isGraphicsLayerCARemote() const { return false; }
</span><span class="cx"> virtual bool isGraphicsLayerTextureMapper() const { return false; }
</span><span class="cx">
</span><ins>+ virtual bool needsClippingMaskLayer() { return true; };
+
</ins><span class="cx"> protected:
</span><span class="cx"> // Should be called from derived class destructors. Should call willBeDestroyed() on super.
</span><span class="cx"> WEBCORE_EXPORT virtual void willBeDestroyed();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> GraphicsLayerPaintMask = (1 << 2),
</span><span class="cx"> GraphicsLayerPaintOverflowContents = (1 << 3),
</span><span class="cx"> GraphicsLayerPaintCompositedScroll = (1 << 4),
</span><ins>+ GraphicsLayerPaintChildClippingMask = (1 << 5),
</ins><span class="cx"> GraphicsLayerPaintAllWithOverflowClip = (GraphicsLayerPaintBackground | GraphicsLayerPaintForeground | GraphicsLayerPaintMask)
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned GraphicsLayerPaintingPhase;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -2027,6 +2027,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool GraphicsLayerCA::applyClippingBorder(const FloatRoundedRect& roundedRect)
+{
+ if (roundedRect.radii().isUniformCornerRadius()) {
+ m_layer->setMask(nullptr);
+ m_layer->setMasksToBounds(true);
+ m_layer->setCornerRadius(roundedRect.radii().topLeft().width());
+ } else {
+ if (!m_shapeMaskLayer) {
+ m_shapeMaskLayer = createPlatformCALayer(PlatformCALayer::LayerTypeShapeLayer, this);
+ m_shapeMaskLayer->setAnchorPoint(FloatPoint3D());
+ }
+
+ m_shapeMaskLayer->setPosition(FloatPoint());
+ m_shapeMaskLayer->setBounds(m_layer->bounds());
+
+ m_layer->setCornerRadius(0);
+ m_layer->setMask(m_shapeMaskLayer.get());
+
+ FloatRoundedRect offsetClippingRoundedRect(m_layer->bounds(), roundedRect.radii());
+ m_shapeMaskLayer->setShapeRoundedRect(offsetClippingRoundedRect);
+ }
+
+ return true;
+}
+
+void GraphicsLayerCA::clearClippingBorder()
+{
+ m_layer->setCornerRadius(0);
+ m_layer->setMasksToBounds(false);
+ m_layer->setMask(nullptr);
+}
+
</ins><span class="cx"> // The clipping strategy depends on whether the rounded rect has equal corner radii.
</span><span class="cx"> void GraphicsLayerCA::updateClippingStrategy(PlatformCALayer& clippingLayer, RefPtr<PlatformCALayer>& shapeMaskLayer, const FloatRoundedRect& roundedRect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -173,6 +173,9 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isGraphicsLayerCA() const override { return true; }
</span><span class="cx">
</span><ins>+ virtual bool applyClippingBorder(const FloatRoundedRect&) override;
+ virtual void clearClippingBorder() override;
+
</ins><span class="cx"> WEBCORE_EXPORT virtual void willBeDestroyed() override;
</span><span class="cx">
</span><span class="cx"> // PlatformCALayerClient overrides
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingPaintPhaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/PaintPhase.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/PaintPhase.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/PaintPhase.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -49,7 +49,8 @@
</span><span class="cx"> PaintPhaseSelection,
</span><span class="cx"> PaintPhaseCollapsedTableBorders,
</span><span class="cx"> PaintPhaseTextClip,
</span><del>- PaintPhaseMask
</del><ins>+ PaintPhaseMask,
+ PaintPhaseClippingMask
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum PaintBehaviorFlags {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -1575,6 +1575,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (paintPhase == PaintPhaseClippingMask && style().visibility() == VISIBLE) {
+ paintClippingMask(paintInfo, paintOffset);
+ return;
+ }
+
</ins><span class="cx"> // If just painting the root background, then return.
</span><span class="cx"> if (paintInfo.paintRootBackgroundOnly())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -1480,6 +1480,15 @@
</span><span class="cx"> paintMaskImages(paintInfo, paintRect);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderBox::paintClippingMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
+{
+ if (!paintInfo.shouldPaintWithinRoot(*this) || style().visibility() != VISIBLE || paintInfo.phase != PaintPhaseClippingMask || paintInfo.context->paintingDisabled())
+ return;
+
+ LayoutRect paintRect = LayoutRect(paintOffset, size());
+ paintInfo.context->fillRect(snappedIntRect(paintRect), Color::black, style().colorSpace());
+}
+
</ins><span class="cx"> void RenderBox::paintMaskImages(const PaintInfo& paintInfo, const LayoutRect& paintRect)
</span><span class="cx"> {
</span><span class="cx"> // Figure out if we need to push a transparency layer to render our mask.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -495,6 +495,7 @@
</span><span class="cx"> virtual void paintObject(PaintInfo&, const LayoutPoint&) { ASSERT_NOT_REACHED(); }
</span><span class="cx"> virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
</span><span class="cx"> virtual void paintMask(PaintInfo&, const LayoutPoint&);
</span><ins>+ virtual void paintClippingMask(PaintInfo&, const LayoutPoint&);
</ins><span class="cx"> virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override;
</span><span class="cx">
</span><span class="cx"> // Called when a positioned object moves but doesn't necessarily change size. A simplified layout is attempted
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -4195,6 +4195,11 @@
</span><span class="cx"> paintMaskForFragments(layerFragments, context, localPaintingInfo, subtreePaintRootForRenderer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((localPaintFlags & PaintLayerPaintingChildClippingMaskPhase) && shouldPaintContent && !selectionOnly) {
+ // Paint the border radius mask for the fragments.
+ paintChildClippingMaskForFragments(layerFragments, context, localPaintingInfo, subtreePaintRootForRenderer);
+ }
+
</ins><span class="cx"> // End our transparency layer
</span><span class="cx"> if (haveTransparency && m_usedTransparency && !m_paintingInsideReflection) {
</span><span class="cx"> context->endTransparencyLayer();
</span><span class="lines">@@ -4613,6 +4618,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayer::paintChildClippingMaskForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
+ RenderObject* subtreePaintRootForRenderer)
+{
+ for (size_t i = 0; i < layerFragments.size(); ++i) {
+ const LayerFragment& fragment = layerFragments.at(i);
+ if (!fragment.shouldPaintContent)
+ continue;
+
+ if (localPaintingInfo.clipToDirtyRect)
+ clipToRect(localPaintingInfo, context, fragment.foregroundRect, IncludeSelfForBorderRadius); // Child clipping mask painting will handle clipping to self.
+
+ // Paint the clipped mask.
+ PaintInfo paintInfo(context, fragment.backgroundRect.rect(), PaintPhaseClippingMask, PaintBehaviorNormal, subtreePaintRootForRenderer, nullptr, nullptr, &localPaintingInfo.rootLayer->renderer());
+ renderer().paint(paintInfo, toLayoutPoint(fragment.layerBounds.location() - renderBoxLocation() + localPaintingInfo.subpixelAccumulation));
+
+ if (localPaintingInfo.clipToDirtyRect)
+ restoreClip(context, localPaintingInfo.paintDirtyRect, fragment.foregroundRect);
+ }
+}
+
</ins><span class="cx"> void RenderLayer::paintOverflowControlsForFragments(const LayerFragments& layerFragments, GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo)
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < layerFragments.size(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -667,6 +667,7 @@
</span><span class="cx"> PaintLayerPaintingOverflowContents = 1 << 9,
</span><span class="cx"> PaintLayerPaintingRootBackgroundOnly = 1 << 10,
</span><span class="cx"> PaintLayerPaintingSkipRootBackground = 1 << 11,
</span><ins>+ PaintLayerPaintingChildClippingMaskPhase = 1 << 12,
</ins><span class="cx"> PaintLayerPaintingCompositingAllPhases = (PaintLayerPaintingCompositingBackgroundPhase | PaintLayerPaintingCompositingForegroundPhase | PaintLayerPaintingCompositingMaskPhase)
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1009,6 +1010,7 @@
</span><span class="cx"> void paintOutlineForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, PaintBehavior, RenderObject* paintingRootForRenderer);
</span><span class="cx"> void paintOverflowControlsForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&);
</span><span class="cx"> void paintMaskForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);
</span><ins>+ void paintChildClippingMaskForFragments(const LayerFragments&, GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer);
</ins><span class="cx"> void paintTransformedLayerIntoFragments(GraphicsContext*, const LayerPaintingInfo&, PaintLayerFlags);
</span><span class="cx">
</span><span class="cx"> RenderLayer* transparentPaintingAncestor();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> updateForegroundLayer(false);
</span><span class="cx"> updateBackgroundLayer(false);
</span><span class="cx"> updateMaskLayer(false);
</span><ins>+ updateChildClippingStrategy(false);
</ins><span class="cx"> updateScrollingLayers(false);
</span><span class="cx"> detachFromScrollingCoordinator();
</span><span class="cx"> destroyGraphicsLayers();
</span><span class="lines">@@ -348,6 +349,7 @@
</span><span class="cx"> m_backgroundLayer = nullptr;
</span><span class="cx"> m_childContainmentLayer = nullptr;
</span><span class="cx"> m_maskLayer = nullptr;
</span><ins>+ m_childClippingMaskLayer = nullptr;
</ins><span class="cx">
</span><span class="cx"> m_scrollingLayer = nullptr;
</span><span class="cx"> m_scrollingContentsLayer = nullptr;
</span><span class="lines">@@ -569,6 +571,8 @@
</span><span class="cx">
</span><span class="cx"> updateMaskLayer(renderer().hasMask());
</span><span class="cx">
</span><ins>+ updateChildClippingStrategy(needsDescendentsClippingLayer);
+
</ins><span class="cx"> if (m_owningLayer.hasReflection()) {
</span><span class="cx"> if (m_owningLayer.reflectionLayer()->backing()) {
</span><span class="cx"> GraphicsLayer* reflectionLayer = m_owningLayer.reflectionLayer()->backing()->graphicsLayer();
</span><span class="lines">@@ -814,6 +818,12 @@
</span><span class="cx"> clipLayer->setPosition(FloatPoint(clippingBox.location() - localCompositingBounds.location()));
</span><span class="cx"> clipLayer->setSize(clippingBox.size());
</span><span class="cx"> clipLayer->setOffsetFromRenderer(toFloatSize(clippingBox.location()));
</span><ins>+
+ if (m_childClippingMaskLayer && !m_scrollingLayer) {
+ m_childClippingMaskLayer->setSize(clipLayer->size());
+ m_childClippingMaskLayer->setPosition(FloatPoint());
+ m_childClippingMaskLayer->setOffsetFromRenderer(clipLayer->offsetFromRenderer());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_maskLayer) {
</span><span class="lines">@@ -942,6 +952,12 @@
</span><span class="cx"> FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</span><span class="cx"> m_scrollingLayer->setOffsetFromRenderer(-toFloatSize(paddingBox.location()));
</span><span class="cx">
</span><ins>+ if (m_childClippingMaskLayer) {
+ m_childClippingMaskLayer->setPosition(m_scrollingLayer->position());
+ m_childClippingMaskLayer->setSize(m_scrollingLayer->size());
+ m_childClippingMaskLayer->setOffsetFromRenderer(toFloatSize(paddingBox.location()));
+ }
+
</ins><span class="cx"> bool paddingBoxOffsetChanged = oldScrollingLayerOffset != m_scrollingLayer->offsetFromRenderer();
</span><span class="cx">
</span><span class="cx"> IntSize scrollSize(m_owningLayer.scrollWidth(), m_owningLayer.scrollHeight());
</span><span class="lines">@@ -1414,6 +1430,37 @@
</span><span class="cx"> m_graphicsLayer->setPaintingPhase(paintingPhaseForPrimaryLayer());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayerBacking::updateChildClippingStrategy(bool needsDescendentsClippingLayer)
+{
+ if (hasClippingLayer() && needsDescendentsClippingLayer) {
+ if (is<RenderBox>(renderer())) {
+ LayoutRect boxRect(LayoutPoint(), downcast<RenderBox>(renderer()).size());
+ FloatRoundedRect contentsClippingRect = renderer().style().getRoundedInnerBorderFor(boxRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor());
+ contentsClippingRect.move(contentOffsetInCompostingLayer());
+ if (clippingLayer()->applyClippingBorder(contentsClippingRect)) {
+ if (m_childClippingMaskLayer)
+ m_childClippingMaskLayer = nullptr;
+ return;
+ }
+ }
+
+ if (!m_childClippingMaskLayer) {
+ m_childClippingMaskLayer = createGraphicsLayer("Child Clipping Mask Layer");
+ m_childClippingMaskLayer->setDrawsContent(true);
+ m_childClippingMaskLayer->setPaintingPhase(GraphicsLayerPaintChildClippingMask);
+ clippingLayer()->setMaskLayer(m_childClippingMaskLayer.get());
+ }
+ } else {
+ if (m_childClippingMaskLayer) {
+ m_childClippingMaskLayer = nullptr;
+ if (hasClippingLayer())
+ clippingLayer()->setMaskLayer(nullptr);
+ } else
+ if (hasClippingLayer())
+ clippingLayer()->clearClippingBorder();
+ }
+}
+
</ins><span class="cx"> bool RenderLayerBacking::updateScrollingLayers(bool needsScrollingLayers)
</span><span class="cx"> {
</span><span class="cx"> if (needsScrollingLayers == !!m_scrollingLayer)
</span><span class="lines">@@ -2065,6 +2112,9 @@
</span><span class="cx"> if (m_maskLayer && m_maskLayer->drawsContent())
</span><span class="cx"> m_maskLayer->setNeedsDisplay();
</span><span class="cx">
</span><ins>+ if (m_childClippingMaskLayer && m_childClippingMaskLayer->drawsContent())
+ m_childClippingMaskLayer->setNeedsDisplay();
+
</ins><span class="cx"> if (m_scrollingContentsLayer && m_scrollingContentsLayer->drawsContent())
</span><span class="cx"> m_scrollingContentsLayer->setNeedsDisplay();
</span><span class="cx"> }
</span><span class="lines">@@ -2104,6 +2154,12 @@
</span><span class="cx"> m_maskLayer->setNeedsDisplayInRect(layerDirtyRect, shouldClip);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_childClippingMaskLayer && m_childClippingMaskLayer->drawsContent()) {
+ FloatRect layerDirtyRect = r;
+ layerDirtyRect.move(-m_childClippingMaskLayer->offsetFromRenderer());
+ m_childClippingMaskLayer->setNeedsDisplayInRect(layerDirtyRect);
+ }
+
</ins><span class="cx"> if (m_scrollingContentsLayer && m_scrollingContentsLayer->drawsContent()) {
</span><span class="cx"> FloatRect layerDirtyRect = pixelSnappedRectForPainting;
</span><span class="cx"> layerDirtyRect.move(-m_scrollingContentsLayer->offsetFromRenderer() + m_devicePixelFractionFromRenderer);
</span><span class="lines">@@ -2138,6 +2194,8 @@
</span><span class="cx"> paintFlags |= RenderLayer::PaintLayerPaintingCompositingForegroundPhase;
</span><span class="cx"> if (paintingPhase & GraphicsLayerPaintMask)
</span><span class="cx"> paintFlags |= RenderLayer::PaintLayerPaintingCompositingMaskPhase;
</span><ins>+ if (paintingPhase & GraphicsLayerPaintChildClippingMask)
+ paintFlags |= RenderLayer::PaintLayerPaintingChildClippingMaskPhase;
</ins><span class="cx"> if (paintingPhase & GraphicsLayerPaintOverflowContents)
</span><span class="cx"> paintFlags |= RenderLayer::PaintLayerPaintingOverflowContents;
</span><span class="cx"> if (paintingPhase & GraphicsLayerPaintCompositedScroll)
</span><span class="lines">@@ -2202,6 +2260,7 @@
</span><span class="cx"> || graphicsLayer == m_foregroundLayer.get()
</span><span class="cx"> || graphicsLayer == m_backgroundLayer.get()
</span><span class="cx"> || graphicsLayer == m_maskLayer.get()
</span><ins>+ || graphicsLayer == m_childClippingMaskLayer.get()
</ins><span class="cx"> || graphicsLayer == m_scrollingContentsLayer.get()) {
</span><span class="cx"> InspectorInstrumentation::willPaint(&renderer());
</span><span class="cx">
</span><span class="lines">@@ -2578,6 +2637,8 @@
</span><span class="cx"> backingMemory += m_backgroundLayer->backingStoreMemoryEstimate();
</span><span class="cx"> if (m_maskLayer)
</span><span class="cx"> backingMemory += m_maskLayer->backingStoreMemoryEstimate();
</span><ins>+ if (m_childClippingMaskLayer)
+ backingMemory += m_childClippingMaskLayer->backingStoreMemoryEstimate();
</ins><span class="cx">
</span><span class="cx"> if (m_scrollingContentsLayer)
</span><span class="cx"> backingMemory += m_scrollingContentsLayer->backingStoreMemoryEstimate();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (178028 => 178029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-07 09:51:48 UTC (rev 178028)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-01-07 10:22:16 UTC (rev 178029)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> ScrollingNodeID scrollingNodeIDForChildren() const { return m_scrollingNodeID ? m_scrollingNodeID : m_viewportConstrainedNodeID; }
</span><span class="cx">
</span><span class="cx"> bool hasMaskLayer() const { return m_maskLayer != 0; }
</span><ins>+ bool hasChildClippingMaskLayer() const { return m_childClippingMaskLayer != nullptr; }
</ins><span class="cx">
</span><span class="cx"> GraphicsLayer* parentForSublayers() const;
</span><span class="cx"> GraphicsLayer* childForSuperlayers() const;
</span><span class="lines">@@ -268,6 +269,7 @@
</span><span class="cx"> bool requiresScrollCornerLayer() const;
</span><span class="cx"> bool updateScrollingLayers(bool scrollingLayers);
</span><span class="cx"> void updateDrawsContent(bool isSimpleContainer);
</span><ins>+ void updateChildClippingStrategy(bool needsDescendentsClippingLayer);
</ins><span class="cx">
</span><span class="cx"> void updateRootLayerConfiguration();
</span><span class="cx">
</span><span class="lines">@@ -335,6 +337,7 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_backgroundLayer; // Only used in cases where we need to draw the background separately.
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_childContainmentLayer; // Only used if we have clipping on a stacking context with compositing children, or if the layer has a tile cache.
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_maskLayer; // Only used if we have a mask.
</span><ins>+ std::unique_ptr<GraphicsLayer> m_childClippingMaskLayer; // Only used if we have to clip child layers or accelerated contents with border radius or clip-path.
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_layerForHorizontalScrollbar;
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_layerForVerticalScrollbar;
</span></span></pre>
</div>
</div>
</body>
</html>