<!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>[178002] 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/178002">178002</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 16:08:36 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some composting reflections tests are broken
https://bugs.webkit.org/show_bug.cgi?id=139889
Reviewed by Tim Horton.
Source/WebCore:
When creating layer clones for reflections, we'd clobber the layer background
color via resetting the custom appearance on the clone. Fix by having
PlatformCALayerMac::updateCustomAppearance() only do work when the appearance changes.
Some other drive-by nullptr changes, and include layer IDs in debug layer names.
Covered by existing pixel tests.
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setName):
(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::updateCustomAppearance):
(PlatformCALayerMac::tiledBacking):
LayoutTests:
New image baselines.
* platform/mac/compositing/reflections/animation-inside-reflection-expected.png:
* platform/mac/compositing/reflections/compositing-change-inside-reflection-expected.png:
* platform/mac/compositing/reflections/masked-reflection-on-composited-expected.png:
* platform/mac/compositing/reflections/reflection-opacity-expected.png:
* platform/mac/compositing/reflections/transform-inside-reflection-expected.png:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingreflectionsanimationinsidereflectionexpectedpng">trunk/LayoutTests/platform/mac/compositing/reflections/animation-inside-reflection-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingreflectionscompositingchangeinsidereflectionexpectedpng">trunk/LayoutTests/platform/mac/compositing/reflections/compositing-change-inside-reflection-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingreflectionsmaskedreflectiononcompositedexpectedpng">trunk/LayoutTests/platform/mac/compositing/reflections/masked-reflection-on-composited-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingreflectionsreflectionopacityexpectedpng">trunk/LayoutTests/platform/mac/compositing/reflections/reflection-opacity-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmaccompositingreflectionstransforminsidereflectionexpectedpng">trunk/LayoutTests/platform/mac/compositing/reflections/transform-inside-reflection-expected.png</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="#trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm">trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178001 => 178002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-06 23:40:04 UTC (rev 178001)
+++ trunk/LayoutTests/ChangeLog 2015-01-07 00:08:36 UTC (rev 178002)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-01-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Some composting reflections tests are broken
+ https://bugs.webkit.org/show_bug.cgi?id=139889
+
+ Reviewed by Tim Horton.
+
+ New image baselines.
+
+ * platform/mac/compositing/reflections/animation-inside-reflection-expected.png:
+ * platform/mac/compositing/reflections/compositing-change-inside-reflection-expected.png:
+ * platform/mac/compositing/reflections/masked-reflection-on-composited-expected.png:
+ * platform/mac/compositing/reflections/reflection-opacity-expected.png:
+ * platform/mac/compositing/reflections/transform-inside-reflection-expected.png:
+
+2015-01-06 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Replace some pixel results that were generated on Linux with no alpha with images
</span><span class="cx"> having alpha, generated on Mac, since the canonical expected image format should have alpha.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingreflectionsanimationinsidereflectionexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/reflections/animation-inside-reflection-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingreflectionscompositingchangeinsidereflectionexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/reflections/compositing-change-inside-reflection-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingreflectionsmaskedreflectiononcompositedexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/reflections/masked-reflection-on-composited-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingreflectionsreflectionopacityexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/reflections/reflection-opacity-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaccompositingreflectionstransforminsidereflectionexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/compositing/reflections/transform-inside-reflection-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178001 => 178002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 23:40:04 UTC (rev 178001)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 00:08:36 UTC (rev 178002)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-06 Simon Fraser <simon.fraser@apple.com>
+
+ Some composting reflections tests are broken
+ https://bugs.webkit.org/show_bug.cgi?id=139889
+
+ Reviewed by Tim Horton.
+
+ When creating layer clones for reflections, we'd clobber the layer background
+ color via resetting the custom appearance on the clone. Fix by having
+ PlatformCALayerMac::updateCustomAppearance() only do work when the appearance changes.
+
+ Some other drive-by nullptr changes, and include layer IDs in debug layer names.
+
+ Covered by existing pixel tests.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setName):
+ (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
+ * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+ (PlatformCALayerMac::updateCustomAppearance):
+ (PlatformCALayerMac::tiledBacking):
+
</ins><span class="cx"> 2015-01-04 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Modernize the HTMLElement factory
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (178001 => 178002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-06 23:40:04 UTC (rev 178001)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-01-07 00:08:36 UTC (rev 178002)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> if (!m_layer->isPlatformCALayerRemote())
</span><span class="cx"> caLayerDescription = String::format("CALayer(%p) ", m_layer->platformLayer());
</span><span class="cx">
</span><del>- String longName = caLayerDescription + String::format("GraphicsLayer(%p) ", this) + name;
</del><ins>+ String longName = caLayerDescription + String::format("GraphicsLayer(%p, %llu) ", this, primaryLayerID()) + name;
</ins><span class="cx"> GraphicsLayer::setName(longName);
</span><span class="cx"> noteLayerPropertyChanged(NameChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -3143,7 +3143,7 @@
</span><span class="cx"> m_uncommittedChanges |= VisibleRectChanged;
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- String name = String::format("%sCALayer(%p) GraphicsLayer(%p) ", (m_layer->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) ? "Tiled " : "", m_layer->platformLayer(), this) + m_name;
</del><ins>+ String name = String::format("%sCALayer(%p) GraphicsLayer(%p, %llu) ", (m_layer->layerType() == PlatformCALayer::LayerTypeWebTiledLayer) ? "Tiled " : "", m_layer->platformLayer(), this, primaryLayerID()) + m_name;
</ins><span class="cx"> m_layer->setName(name);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -3185,7 +3185,7 @@
</span><span class="cx"> PassRefPtr<PlatformCALayer> GraphicsLayerCA::findOrMakeClone(CloneID cloneID, PlatformCALayer *sourceLayer, LayerMap* clones, CloneLevel cloneLevel)
</span><span class="cx"> {
</span><span class="cx"> if (!sourceLayer)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<PlatformCALayer> resultLayer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacPlatformCALayerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm (178001 => 178002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2015-01-06 23:40:04 UTC (rev 178001)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm 2015-01-07 00:08:36 UTC (rev 178002)
</span><span class="lines">@@ -856,6 +856,9 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerMac::updateCustomAppearance(GraphicsLayer::CustomAppearance appearance)
</span><span class="cx"> {
</span><ins>+ if (m_customAppearance == appearance)
+ return;
+
</ins><span class="cx"> m_customAppearance = appearance;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="lines">@@ -890,7 +893,7 @@
</span><span class="cx"> TiledBacking* PlatformCALayerMac::tiledBacking()
</span><span class="cx"> {
</span><span class="cx"> if (!usesTiledBackingLayer())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> WebTiledBackingLayer *tiledBackingLayer = static_cast<WebTiledBackingLayer *>(m_layer.get());
</span><span class="cx"> return [tiledBackingLayer tiledBacking];
</span></span></pre>
</div>
</div>
</body>
</html>