<!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>[185187] 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/185187">185187</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-06-03 21:42:57 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/184968">r184968</a>): missing media player buttons (control bar exists, but no buttons)
https://bugs.webkit.org/show_bug.cgi?id=145630
Reviewed by Zalan Bujtas.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/184968">r184968</a> changed the initial value of m_intersectsCoverageRect to false. However,
this triggered a bug with mask layers, whose value of m_intersectsCoverageRect was never
updated.
Fix by copying the value of m_intersectsCoverageRect from the main layer to its
mask layer, just as we do for m_visibleRect and m_coverageRect.
Test: compositing/visible-rect/mask-layer-coverage.html
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
LayoutTests:
Test that dumps coverage info for a layer with a mask.
* compositing/visible-rect/mask-layer-coverage-expected.txt: Added.
* compositing/visible-rect/mask-layer-coverage.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="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingvisiblerectmasklayercoverageexpectedtxt">trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingvisiblerectmasklayercoveragehtml">trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185186 => 185187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-04 04:42:52 UTC (rev 185186)
+++ trunk/LayoutTests/ChangeLog 2015-06-04 04:42:57 UTC (rev 185187)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-06-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r184968): missing media player buttons (control bar exists, but no buttons)
+ https://bugs.webkit.org/show_bug.cgi?id=145630
+
+ Reviewed by Zalan Bujtas.
+
+ Test that dumps coverage info for a layer with a mask.
+
+ * compositing/visible-rect/mask-layer-coverage-expected.txt: Added.
+ * compositing/visible-rect/mask-layer-coverage.html: Added.
+
+2015-06-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Layer tree dumps should include mask layers
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145629
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscompositingvisiblerectmasklayercoverageexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt (0 => 185187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage-expected.txt 2015-06-04 04:42:57 UTC (rev 185187)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (visible rect 0.00, 0.00 800.00 x 600.00)
+ (coverage rect 0.00, 0.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 44.00 42.00)
+ (contentsOpaque 1)
+ (mask layer)
+ (GraphicsLayer
+ (bounds 44.00 42.00)
+ (drawsContent 1)
+ (visible rect 0.00, 0.00 44.00 x 42.00)
+ (coverage rect -8.00, -8.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ )
+ (visible rect 0.00, 0.00 44.00 x 42.00)
+ (coverage rect -8.00, -8.00 800.00 x 600.00)
+ (intersects coverage rect 1)
+ (contentsScale 1.00)
+ (contents layer 0.00, 0.00 44.00 x 42.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingvisiblerectmasklayercoveragehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage.html (0 => 185187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage.html (rev 0)
+++ trunk/LayoutTests/compositing/visible-rect/mask-layer-coverage.html 2015-06-04 04:42:57 UTC (rev 185187)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ height: 42px;
+ width: 44px;
+ background-color: blue;
+ -webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAsCAYAAAATmipGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUZJREFUeNrU2S8sRWEYgPFzD7PZbDYbQSAoBBKFwgQTmKRpJE3SaBKFRKJJJphiCslNt1AERRBsNpvN/DmeL7ybGfLzne3Xn517d873vqcsimIOtSKDq0Id0zmEhktM5hAazjGWQ2g4xUgOocknjjFkDw0fOMSAPfR78AH67KHhDXvotYeGV+yg2x4aXrCFLntoeMYGOuyh4QnraLeHhkesos0eGh6wglZ7aLjHMlrsoeEOi2i2h4ZbLKC0h4ZrzP8XXMk0MPvbeFRJXf0cjyq5NB5NlIX/qsX/1non6/afvvHXrsESeGN/PMUDv8n8Cl0yv0L1hxL9MU9/cE6jyJp5FNEPd2lc3kSneQGxbV5ApJXOLnqsK5137JuXZLF27Dcvco8waF7knmDYvBo/w6j5Y8MFxs2fb9LEN2UfnmaKDD4xfgkwANpCXZrruKGvAAAAAElFTkSuQmCC);
+ }
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function doTest()
+ {
+ if (window.internals)
+ document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS)
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="composited box"></div>
+<pre id="layers">Layer tree goes here when testing</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185186 => 185187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-04 04:42:52 UTC (rev 185186)
+++ trunk/Source/WebCore/ChangeLog 2015-06-04 04:42:57 UTC (rev 185187)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-06-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r184968): missing media player buttons (control bar exists, but no buttons)
+ https://bugs.webkit.org/show_bug.cgi?id=145630
+
+ Reviewed by Zalan Bujtas.
+
+ r184968 changed the initial value of m_intersectsCoverageRect to false. However,
+ this triggered a bug with mask layers, whose value of m_intersectsCoverageRect was never
+ updated.
+
+ Fix by copying the value of m_intersectsCoverageRect from the main layer to its
+ mask layer, just as we do for m_visibleRect and m_coverageRect.
+
+ Test: compositing/visible-rect/mask-layer-coverage.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+
+2015-06-03 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Layer tree dumps should include mask layers
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145629
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (185186 => 185187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-06-04 04:42:52 UTC (rev 185186)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-06-04 04:42:57 UTC (rev 185187)
</span><span class="lines">@@ -1284,6 +1284,11 @@
</span><span class="cx"> if (intersectsCoverageRect != m_intersectsCoverageRect) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_intersectsCoverageRect = intersectsCoverageRect;
</span><ins>+
+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
+ maskLayer->m_uncommittedChanges |= CoverageRectChanged;
+ maskLayer->m_intersectsCoverageRect = intersectsCoverageRect;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (visibleRectChanged) {
</span></span></pre>
</div>
</div>
</body>
</html>