<!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>[184233] branches/safari-601.1.32-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/184233">184233</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 20:02:40 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183942">r183942</a>. rdar://problem/20049088</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchLayoutTestsChangeLog">branches/safari-601.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601132branchLayoutTestsplatformmacmavericksTestExpectations">branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184232 => 184233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183894. rdar://problem/20049088
</del><ins>+ Merge r183942. rdar://problem/20049088
</ins><span class="cx">
</span><span class="cx"> 2015-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="lines">@@ -11,13 +11,36 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span><span class="cx">
</span><ins>+ Take 2 - this was rolled out because Mavericks was crashing.
+
</ins><span class="cx"> A test that creates some backdrop views, then makes them
</span><span class="cx"> big enough that it would trigger tiling (which we don't want
</span><span class="cx"> to happen).
</span><span class="cx">
</span><span class="cx"> * compositing/media-controls-bar-appearance-big-expected.txt: Added.
</span><span class="cx"> * compositing/media-controls-bar-appearance-big.html: Added.
</span><ins>+ * platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
</ins><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <dino@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ A test that creates some backdrop views, then makes them
+ big enough that it would trigger tiling (which we don't want
+ to happen).
+
+ * compositing/media-controls-bar-appearance-big-expected.txt: Added.
+ * compositing/media-controls-bar-appearance-big.html: Added.
+
</ins><span class="cx"> 2015-05-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll-snap points do not handle margins and padding propertly
</span></span></pre></div>
<a id="branchessafari601132branchLayoutTestsplatformmacmavericksTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations (184232 => 184233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-13 03:02:40 UTC (rev 184233)
</span><span class="lines">@@ -5,3 +5,7 @@
</span><span class="cx"> fast/events/mouse-force-changed.html [ Skip ]
</span><span class="cx"> fast/events/mouse-force-down.html [ Skip ]
</span><span class="cx"> fast/events/mouse-force-up.html [ Skip ]
</span><ins>+
+# No support for Filters Level 2
+compositing/media-controls-bar-appearance.html [ Skip ]
+compositing/media-controls-bar-appearance-big.html [ Skip ]
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184232 => 184233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183894. rdar://problem/20049088
</del><ins>+ Merge r183942. rdar://problem/20049088
</ins><span class="cx">
</span><span class="cx"> 2015-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span><span class="cx">
</span><ins>+ Take 2 - this was rolled out because Mavericks was crashing.
+
</ins><span class="cx"> Make sure backdrop layers don't tile. If they are big
</span><span class="cx"> enough, we'll leave it to the platform compositor to handle.
</span><span class="cx">
</span><span class="lines">@@ -24,6 +26,32 @@
</span><span class="cx"> (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
</span><span class="cx"> a layer needs a backdrop before checking if it needs to tile.
</span><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <dino@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Make sure backdrop layers don't tile. If they are big
+ enough, we'll leave it to the platform compositor to handle.
+
+ This also fixes a bug where if a layer changed from a backdrop
+ type to a tiled type, it would still retain its custom appearance
+ and we'd try to add children to the wrong layer.
+
+ Test: compositing/media-controls-bar-appearance-big.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
+ a layer needs a backdrop before checking if it needs to tile.
+
</ins><span class="cx"> 2015-05-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll-snap points do not handle margins and padding propertly
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184232 => 184233)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183894. rdar://problem/20049088
</del><ins>+ Merge r183942. rdar://problem/20049088
</ins><span class="cx">
</span><span class="cx"> 2015-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="lines">@@ -11,11 +11,31 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span><span class="cx">
</span><ins>+ Take 2 - this was rolled out because Mavericks was crashing.
+
</ins><span class="cx"> Add some better logging for custom appearance.
</span><span class="cx">
</span><span class="cx"> * Shared/mac/RemoteLayerTreeTransaction.mm:
</span><span class="cx"> (WebKit::RemoteLayerTreeTextStream::operator<<):
</span><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <dino@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Add some better logging for custom appearance.
+
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTextStream::operator<<):
+
</ins><span class="cx"> 2015-05-11 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r184004.
</span></span></pre>
</div>
</div>
</body>
</html>