<!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>[183894] 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/183894">183894</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-05-06 15:46:01 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle backdrop views that have to tile
https://bugs.webkit.org/show_bug.cgi?id=142317
<rdar://problem/20049088>
Reviewed by Simon Fraser.
Source/WebCore:
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.
Source/WebKit2:
Add some better logging for custom appearance.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTextStream::operator<<):
LayoutTests:
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.</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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmediacontrolsbarappearancebigexpectedtxt">trunk/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingmediacontrolsbarappearancebightml">trunk/LayoutTests/compositing/media-controls-bar-appearance-big.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183893 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-06 22:35:26 UTC (rev 183893)
+++ trunk/LayoutTests/ChangeLog 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [FreeType] Vertical CJK glyphs should not be rendered with synthetic oblique
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmediacontrolsbarappearancebigexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt (0 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 2056.00 4117.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 2056.00 4117.00)
+ (contentsOpaque 1)
+ (children 2
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 2048.00 2048.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 8.00 2056.00)
+ (bounds 2048.00 2048.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestscompositingmediacontrolsbarappearancebightml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/media-controls-bar-appearance-big.html (0 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/media-controls-bar-appearance-big.html (rev 0)
+++ trunk/LayoutTests/compositing/media-controls-bar-appearance-big.html 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ div {
+ position: relative;
+ height: 100px;
+ width: 100px;
+ }
+ .big {
+ width: 2048px;
+ height: 2048px;
+ }
+ .media-controls {
+ -webkit-transform: translate3d(0, 0, 0); /* The element has to request a layer for the appearance to work */
+ }
+ .dark {
+ -webkit-appearance: media-controls-dark-bar-background;
+ }
+ .light {
+ -webkit-appearance: media-controls-light-bar-background;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function change()
+ {
+ var elements = document.querySelectorAll(".media-controls");
+ for (var i = 0; i < elements.length; ++i)
+ elements[i].classList.add("big");
+ setTimeout(dumpLayers, 0);
+ }
+
+ function dumpLayers()
+ {
+ var layersResult = document.getElementById('layers');
+ if (window.testRunner) {
+ layersResult.innerText = window.internals.layerTreeAsText(document);
+ testRunner.notifyDone();
+ }
+ }
+ window.addEventListener('load', change, false)
+ </script>
+</head>
+<body>
+ <div class="media-controls dark">
+ </div>
+ <div class="media-controls light">
+ </div>
+<pre id="layers"></pre>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/media-controls-bar-appearance-big.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183893 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 22:35:26 UTC (rev 183893)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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 Carlos Garcia Campos <cgarcia@igalia.com> and Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile error due to undefined symbols after r183868
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (183893 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-06 22:35:26 UTC (rev 183893)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -1438,10 +1438,10 @@
</span><span class="cx"> bool needBackdropLayerType = (customAppearance() == LightBackdropAppearance || customAppearance() == DarkBackdropAppearance);
</span><span class="cx"> PlatformCALayer::LayerType neededLayerType = m_layer->layerType();
</span><span class="cx">
</span><del>- if (needTiledLayer)
</del><ins>+ if (needBackdropLayerType)
+ neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
+ else if (needTiledLayer)
</ins><span class="cx"> neededLayerType = PlatformCALayer::LayerTypeTiledBackingLayer;
</span><del>- else if (needBackdropLayerType)
- neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
</del><span class="cx"> else if (isCustomBackdropLayerType(m_layer->layerType()) || m_usingTiledBacking)
</span><span class="cx"> neededLayerType = PlatformCALayer::LayerTypeWebLayer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183893 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-06 22:35:26 UTC (rev 183893)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable network cache efficacy logging
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (183893 => 183894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-05-06 22:35:26 UTC (rev 183893)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-05-06 22:46:01 UTC (rev 183894)
</span><span class="lines">@@ -666,6 +666,7 @@
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const FilterOperations&);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const PlatformCAAnimationRemote::Properties&);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const RemoteLayerBackingStore&);
</span><ins>+ RemoteLayerTreeTextStream& operator<<(const WebCore::GraphicsLayer::CustomAppearance&);
</ins><span class="cx"> RemoteLayerTreeTextStream& operator<<(BlendMode);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::AnimationType);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::FillModeType);
</span><span class="lines">@@ -837,6 +838,19 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const WebCore::GraphicsLayer::CustomAppearance& customAppearance)
+{
+ RemoteLayerTreeTextStream& ts = *this;
+ switch (customAppearance) {
+ case WebCore::GraphicsLayer::CustomAppearance::NoCustomAppearance: ts << "none"; break;
+ case WebCore::GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
+ case WebCore::GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
+ case WebCore::GraphicsLayer::CustomAppearance::LightBackdropAppearance: ts << "light-backdrop"; break;
+ case WebCore::GraphicsLayer::CustomAppearance::DarkBackdropAppearance: ts << "dark-backdrop"; break;
+ }
+ return ts;
+}
+
</ins><span class="cx"> RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(BlendMode blendMode)
</span><span class="cx"> {
</span><span class="cx"> RemoteLayerTreeTextStream& ts = *this;
</span></span></pre>
</div>
</div>
</body>
</html>