<!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>[181164] trunk</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/181164">181164</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 10:14:10 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow composited clip-path to be updated without a layer repaint
https://bugs.webkit.org/show_bug.cgi?id=142384
Reviewed by Zalan Bujtas.
Source/WebCore:
When clip-path is mapped to a compositing shape layer mask, we can just
push a new shape to the GraphicsLayer to update the clip path, without
needing to repaint.
Achieve this by adding ContextSensitivePropertyClipPath. When set, and the
stars are aligned, issue a StyleDifferenceRecompositeLayer rather than
a StyleDifferenceRepaint.
We ask RenderLayerCompositor whether the clip path can be composited
to hide platform differences related to whether GraphicsLayer supports
shape masks.
Test: compositing/masks/compositing-clip-path-change-no-repaint.html
* rendering/RenderElement.cpp:
(WebCore::RenderElement::adjustStyleDifference): Remove obvious comment
about opacity. Handle ContextSensitivePropertyClipPath.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::canCompositeClipPath): If we have a mask
we have to paint the mask + clip path into the mask layer (mirrors code in
RenderLayerBacking::updateMaskingLayer but isn't quite similar enough to share).
* rendering/RenderLayerCompositor.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresRepaint): Set ContextSensitivePropertyClipPath
and don't return, as is normal for context-sensitive property handling.
* rendering/style/RenderStyleConstants.h: Line things up to avoid future bit
fumbles, and remove unnecessary braces.
LayoutTests:
Test repaint with a clip-path change.
* compositing/masks/compositing-clip-path-change-no-repaint-expected.txt: Added.
* compositing/masks/compositing-clip-path-change-no-repaint.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathchangenorepaintexpectedtxt">trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathchangenorepainthtml">trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/LayoutTests/ChangeLog 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-06 Simon Fraser <simon.fraser@apple.com>
+
+ Allow composited clip-path to be updated without a layer repaint
+ https://bugs.webkit.org/show_bug.cgi?id=142384
+
+ Reviewed by Zalan Bujtas.
+
+ Test repaint with a clip-path change.
+
+ * compositing/masks/compositing-clip-path-change-no-repaint-expected.txt: Added.
+ * compositing/masks/compositing-clip-path-change-no-repaint.html: Added.
+
</ins><span class="cx"> 2015-03-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening on 6th Mar.
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathchangenorepaintexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt (0 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint-expected.txt 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+box1
+box2
+Only the second box should have a repaint.
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 658.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.00 658.00)
+ (contentsOpaque 1)
+ (children 2
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 8.00 308.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
+ (repaint rects
+ (rect 0.00 0.00 300.00 300.00)
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathchangenorepainthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint.html (0 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-change-no-repaint.html 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 300px;
+ height: 300px;
+ background-color: blue;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ .clipped {
+ -webkit-clip-path: inset(0 50px);
+ }
+
+ .masked {
+ -webkit-mask: linear-gradient(white, transparent);
+ }
+
+ body.changed .clipped {
+ -webkit-clip-path: inset(0 70px);
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+
+ function doTest()
+ {
+ document.body.offsetWidth;
+
+ if (window.internals)
+ window.internals.startTrackingRepaints();
+
+ document.body.classList.add('changed');
+
+ if (window.internals)
+ document.getElementById('repaintRects').textContent = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <div class="clipped composited box">box1</div>
+ <div class="clipped masked composited box">box2</div>
+<p>Only the second box should have a repaint.</p>
+<pre id="repaintRects"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-03-06 Simon Fraser <simon.fraser@apple.com>
+
+ Allow composited clip-path to be updated without a layer repaint
+ https://bugs.webkit.org/show_bug.cgi?id=142384
+
+ Reviewed by Zalan Bujtas.
+
+ When clip-path is mapped to a compositing shape layer mask, we can just
+ push a new shape to the GraphicsLayer to update the clip path, without
+ needing to repaint.
+
+ Achieve this by adding ContextSensitivePropertyClipPath. When set, and the
+ stars are aligned, issue a StyleDifferenceRecompositeLayer rather than
+ a StyleDifferenceRepaint.
+
+ We ask RenderLayerCompositor whether the clip path can be composited
+ to hide platform differences related to whether GraphicsLayer supports
+ shape masks.
+
+ Test: compositing/masks/compositing-clip-path-change-no-repaint.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::adjustStyleDifference): Remove obvious comment
+ about opacity. Handle ContextSensitivePropertyClipPath.
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::canCompositeClipPath): If we have a mask
+ we have to paint the mask + clip path into the mask layer (mirrors code in
+ RenderLayerBacking::updateMaskingLayer but isn't quite similar enough to share).
+ * rendering/RenderLayerCompositor.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresRepaint): Set ContextSensitivePropertyClipPath
+ and don't return, as is normal for context-sensitive property handling.
+ * rendering/style/RenderStyleConstants.h: Line things up to avoid future bit
+ fumbles, and remove unnecessary braces.
+
</ins><span class="cx"> 2015-03-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Process all actions when blocking a URL.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -277,8 +277,6 @@
</span><span class="cx"> diff = std::max(diff, StyleDifferenceRecompositeLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If opacity changed, and we are not composited, need to repaint (also
- // ignoring text nodes)
</del><span class="cx"> if (contextSensitiveProperties & ContextSensitivePropertyOpacity) {
</span><span class="cx"> if (!hasLayer() || !downcast<RenderLayerModelObject>(*this).layer()->isComposited())
</span><span class="cx"> diff = std::max(diff, StyleDifferenceRepaintLayer);
</span><span class="lines">@@ -286,6 +284,16 @@
</span><span class="cx"> diff = std::max(diff, StyleDifferenceRecompositeLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (contextSensitiveProperties & ContextSensitivePropertyClipPath) {
+ if (hasLayer()
+ && downcast<RenderLayerModelObject>(*this).layer()->isComposited()
+ && hasClipPath()
+ && RenderLayerCompositor::canCompositeClipPath(*downcast<RenderLayerModelObject>(*this).layer()))
+ diff = std::max(diff, StyleDifferenceRecompositeLayer);
+ else
+ diff = std::max(diff, StyleDifferenceRepaint);
+ }
+
</ins><span class="cx"> if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
</span><span class="cx"> RenderLayer* layer = downcast<RenderLayerModelObject>(*this).layer();
</span><span class="cx"> if (!layer->isComposited() || layer->paintsWithFilters())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -926,6 +926,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderLayerCompositor::canCompositeClipPath(const RenderLayer& layer)
+{
+ ASSERT(layer.isComposited());
+ ASSERT(layer.renderer().style().clipPath());
+
+ if (layer.renderer().hasMask())
+ return false;
+
+ ClipPathOperation& clipPath = *layer.renderer().style().clipPath();
+ return (clipPath.type() != ClipPathOperation::Shape || clipPath.type() == ClipPathOperation::Shape) && GraphicsLayer::supportsLayerType(GraphicsLayer::Type::Shape);
+}
+
</ins><span class="cx"> bool RenderLayerCompositor::updateBacking(RenderLayer& layer, CompositingChangeRepaint shouldRepaint)
</span><span class="cx"> {
</span><span class="cx"> bool layerChanged = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -173,6 +173,8 @@
</span><span class="cx">
</span><span class="cx"> void layerStyleChanged(RenderLayer&, const RenderStyle* oldStyle);
</span><span class="cx">
</span><ins>+ static bool canCompositeClipPath(const RenderLayer&);
+
</ins><span class="cx"> // Get the nearest ancestor layer that has overflow or clip, but is not a stacking context
</span><span class="cx"> RenderLayer* enclosingNonStackingClippingLayer(const RenderLayer&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderStyle::changeRequiresRepaint(const RenderStyle& other, unsigned&) const
</del><ins>+bool RenderStyle::changeRequiresRepaint(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
</ins><span class="cx"> {
</span><span class="cx"> if (inherited_flags._visibility != other.inherited_flags._visibility
</span><span class="cx"> || inherited_flags.m_printColorAdjust != other.inherited_flags.m_printColorAdjust
</span><span class="lines">@@ -737,8 +737,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath)
- return true;
</del><ins>+ // FIXME: this should probably be moved to changeRequiresLayerRepaint().
+ if (rareNonInheritedData->m_clipPath != other.rareNonInheritedData->m_clipPath) {
+ changedContextSensitiveProperties |= ContextSensitivePropertyClipPath;
+ // Don't return; keep looking for another change.
+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (181163 => 181164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-03-06 18:13:10 UTC (rev 181163)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-03-06 18:14:10 UTC (rev 181164)
</span><span class="lines">@@ -63,11 +63,12 @@
</span><span class="cx"> // A simple StyleDifference does not provide enough information so we return a bit mask of
</span><span class="cx"> // StyleDifferenceContextSensitiveProperties from RenderStyle::diff() too.
</span><span class="cx"> enum StyleDifferenceContextSensitiveProperty {
</span><del>- ContextSensitivePropertyNone = 0,
- ContextSensitivePropertyTransform = (1 << 0),
- ContextSensitivePropertyOpacity = (1 << 1),
- ContextSensitivePropertyFilter = (1 << 2),
- ContextSensitivePropertyClipRect = (1 << 3)
</del><ins>+ ContextSensitivePropertyNone = 0,
+ ContextSensitivePropertyTransform = 1 << 0,
+ ContextSensitivePropertyOpacity = 1 << 1,
+ ContextSensitivePropertyFilter = 1 << 2,
+ ContextSensitivePropertyClipRect = 1 << 3,
+ ContextSensitivePropertyClipPath = 1 << 4
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Static pseudo styles. Dynamic ones are produced on the fly.
</span></span></pre>
</div>
</div>
</body>
</html>