<!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>[212499] branches/safari-603-branch</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/212499">212499</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 16:56:33 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212172">r212172</a>. rdar://problem/30476807</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestscompositingmaskssolidcolormaskedhtml">branches/safari-603-branch/LayoutTests/compositing/masks/solid-color-masked.html</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (212498 => 212499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:56:29 UTC (rev 212498)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212172. rdar://problem/30476807
+
+ 2017-02-10 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r211845): [ios-simulator] LayoutTest compositing/masks/solid-color-masked.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=168054
+
+ Reviewed by Tim Horton.
+
+ Make the timeout 10ms so the test consistently fails with the old code.
+
+ * compositing/masks/solid-color-masked.html:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212168. rdar://problem/29904368
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Ryan Haddad <ryanhaddad@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingmaskssolidcolormaskedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/compositing/masks/solid-color-masked.html (212498 => 212499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/masks/solid-color-masked.html 2017-02-17 00:56:29 UTC (rev 212498)
+++ branches/safari-603-branch/LayoutTests/compositing/masks/solid-color-masked.html 2017-02-17 00:56:33 UTC (rev 212499)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .composited {
</span><del>- -webkit-transform: translateZ(0);
</del><ins>+ transform: translateZ(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .masked {
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> document.getElementById('box').classList.add('masked');
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><del>- }, 0);
</del><ins>+ }, 10);
</ins><span class="cx"> }
</span><span class="cx"> window.addEventListener('load', doTest, false);
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212498 => 212499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:29 UTC (rev 212498)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-17 00:56:33 UTC (rev 212499)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212172. rdar://problem/30476807
+
+ 2017-02-10 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r211845): [ios-simulator] LayoutTest compositing/masks/solid-color-masked.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=168054
+
+ Reviewed by Tim Horton.
+
+ When adding mask layers, there was an ordering dependency. There was a hack in GraphicsLayerCA::setVisibleAndCoverageRects()
+ to propagate m_intersectsCoverageRect to masks. However, if GraphicsLayerCA::setVisibleAndCoverageRects()
+ ran on the masked layer before the mask was added, nothing updated the "m_intersectsCoverageRect" state of the mask layer.
+
+ Fix by explicitly calling setVisibleAndCoverageRects() on the mask layer, passing the same rects and
+ viewport-constrained state as for its host layer (we already assume that their geometry matches).
+
+ Tested by compositing/masks/solid-color-masked.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+ (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r212153. rdar://problem/30467120
</span><span class="cx">
</span><span class="cx"> 2017-02-10 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (212498 => 212499)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-17 00:56:29 UTC (rev 212498)
+++ branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2017-02-17 00:56:33 UTC (rev 212499)
</span><span class="lines">@@ -1332,32 +1332,16 @@
</span><span class="cx"> if (intersectsCoverageRect != m_intersectsCoverageRect) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_intersectsCoverageRect = intersectsCoverageRect;
</span><del>-
- if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
- maskLayer->m_uncommittedChanges |= CoverageRectChanged;
- maskLayer->m_intersectsCoverageRect = intersectsCoverageRect;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (visibleRectChanged) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_visibleRect = rects.visibleRect;
</span><del>-
- if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
- // FIXME: this assumes that the mask layer has the same geometry as this layer (which is currently always true).
- maskLayer->m_uncommittedChanges |= CoverageRectChanged;
- maskLayer->m_visibleRect = rects.visibleRect;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (coverageRectChanged) {
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx"> m_coverageRect = rects.coverageRect;
</span><del>-
- if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
- maskLayer->m_uncommittedChanges |= CoverageRectChanged;
- maskLayer->m_coverageRect = rects.coverageRect;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1423,8 +1407,10 @@
</span><span class="cx">
</span><span class="cx"> childCommitState.ancestorIsViewportConstrained |= m_isViewportConstrained;
</span><span class="cx">
</span><del>- if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
</del><ins>+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
+ maskLayer->setVisibleAndCoverageRects(rects, m_isViewportConstrained || commitState.ancestorIsViewportConstrained);
</ins><span class="cx"> maskLayer->commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> const Vector<GraphicsLayer*>& childLayers = children();
</span><span class="cx"> size_t numChildren = childLayers.size();
</span></span></pre>
</div>
</div>
</body>
</html>