<!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>[172232] branches/safari-600.1.4-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/172232">172232</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:08:16 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172183">r172183</a>. <rdar://problem/17908085></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60014branchLayoutTestsChangeLog">branches/safari-600.1.4-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari60014branchSourceWebCoreChangeLog">branches/safari-600.1.4-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60014branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-600.1.4-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari60014branchLayoutTestscompositingbackingbackfacevisibilityflipexpectedtxt">branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip-expected.txt</a></li>
<li><a href="#branchessafari60014branchLayoutTestscompositingbackingbackfacevisibilityfliphtml">branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60014branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/LayoutTests/ChangeLog (172231 => 172232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/ChangeLog 2014-08-07 20:04:54 UTC (rev 172231)
+++ branches/safari-600.1.4-branch/LayoutTests/ChangeLog 2014-08-07 20:08:16 UTC (rev 172232)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-07 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r172183. <rdar://problem/17908085>
+
+ 2014-08-06 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r168119): Album flipping animation doesn’t work
+ https://bugs.webkit.org/show_bug.cgi?id=132801
+
+ Reviewed by Dean Jackson.
+
+ Test that starts a transform animation and dumps layers.
+
+ * compositing/backing/backface-visibility-flip-expected.txt: Added.
+ * compositing/backing/backface-visibility-flip.html: Added.
+
</ins><span class="cx"> 2014-08-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172112. <rdar://problem/17802174>
</span></span></pre></div>
<a id="branchessafari60014branchLayoutTestscompositingbackingbackfacevisibilityflipexpectedtxtfromrev172183trunkLayoutTestscompositingbackingbackfacevisibilityflipexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip-expected.txt (from rev 172183, trunk/LayoutTests/compositing/backing/backface-visibility-flip-expected.txt) (0 => 172232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip-expected.txt (rev 0)
+++ branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip-expected.txt 2014-08-07 20:08:16 UTC (rev 172232)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+Front Back
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 320.00 320.00)
+ (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
+ (children 1
+ (GraphicsLayer
+ (position 10.00 10.00)
+ (bounds 300.00 300.00)
+ (preserves3D 1)
+ (children 2
+ (GraphicsLayer
+ (bounds 300.00 300.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (backfaceVisibility hidden)
+ )
+ (GraphicsLayer
+ (bounds 300.00 300.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (backfaceVisibility hidden)
+ (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00])
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari60014branchLayoutTestscompositingbackingbackfacevisibilityfliphtmlfromrev172183trunkLayoutTestscompositingbackingbackfacevisibilityfliphtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip.html (from rev 172183, trunk/LayoutTests/compositing/backing/backface-visibility-flip.html) (0 => 172232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip.html (rev 0)
+++ branches/safari-600.1.4-branch/LayoutTests/compositing/backing/backface-visibility-flip.html 2014-08-07 20:08:16 UTC (rev 172232)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ background-color: silver;
+ }
+
+ .container {
+ -webkit-perspective: 500px;
+ width: 300px;
+ padding: 10px;
+ }
+
+ #flipper {
+ width: 300px;
+ height: 300px;
+ -webkit-transform-style: preserve-3d;
+ }
+
+ #flipper > div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ }
+ .flipping {
+ -webkit-animation: flip 2s forwards;
+ }
+
+ .front, .back {
+ -webkit-backface-visibility: hidden;
+ }
+
+ .back {
+ -webkit-transform: rotateY(180deg);
+ }
+
+ @-webkit-keyframes flip {
+ to { -webkit-transform: rotateY(0); }
+ to { -webkit-transform: rotateY(180deg); }
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ var flipper = document.getElementById('flipper');
+ flipper.addEventListener('webkitAnimationStart', testDone, false);
+ flipper.classList.add('flipping');
+ }, 250);
+ }
+
+ function testDone()
+ {
+ var layersResult = document.getElementById('layers');
+ if (window.testRunner) {
+ layersResult.innerText = window.internals.layerTreeAsText(document);
+ testRunner.notifyDone();
+ }
+ }
+ window.addEventListener('load', doTest, false)
+ </script>
+</head>
+<body>
+ <div class="container">
+ <div id="flipper">
+ <div class="front box">
+ Front
+ </div>
+ <div class="back box">
+ Back
+ </div>
+ </div>
+ </div>
+<pre id="layers"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari60014branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (172231 => 172232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-07 20:04:54 UTC (rev 172231)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-07 20:08:16 UTC (rev 172232)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-08-07 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172183. <rdar://problem/17908085>
+
+ 2014-08-06 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r168119): Album flipping animation doesn’t work
+ https://bugs.webkit.org/show_bug.cgi?id=132801
+ <rdar://problem/16878497>, <rdar://problem/17908085>
+
+ Reviewed by Dean Jackson.
+
+ In r168119 I avoided creating backing store for backface-visibility:hidden unless
+ some ancestor was 3d-transformed. However, when starting transitions or animations
+ that apply transforms, we don't do a layout, and therefore don't update the RenderLayer
+ flags that mark an ancestor as having a transform. This broke various content which
+ used backface-visibility:hidden for "flip" animations.
+
+ Make a low-risk fix that looks for the pattern of CSS properties used for flipping,
+ making a compositing layer for backface-visibility:hidden if the stacking context element
+ has transform-style: preserve-3d.
+
+ Test: compositing/backing/backface-visibility-flip.html
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForBackfaceVisibility):
+
+2014-08-07 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r172006. <rdar://problem/17947503>
</span><span class="cx">
</span><span class="cx"> 2014-08-04 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (172231 => 172232)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-08-07 20:04:54 UTC (rev 172231)
+++ branches/safari-600.1.4-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-08-07 20:08:16 UTC (rev 172232)
</span><span class="lines">@@ -2392,7 +2392,18 @@
</span><span class="cx"> if (!(m_compositingTriggers & ChromeClient::ThreeDTransformTrigger))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return renderer.style().backfaceVisibility() == BackfaceVisibilityHidden && renderer.layer()->has3DTransformedAncestor();
</del><ins>+ if (renderer.style().backfaceVisibility() != BackfaceVisibilityHidden)
+ return false;
+
+ if (renderer.layer()->has3DTransformedAncestor())
+ return true;
+
+ // FIXME: workaround for webkit.org/b/132801
+ RenderLayer* stackingContext = renderer.layer()->stackingContainer();
+ if (stackingContext && stackingContext->renderer().style().transformStyle3D() == TransformStyle3DPreserve3D)
+ return true;
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerCompositor::requiresCompositingForVideo(RenderLayerModelObject& renderer) const
</span></span></pre>
</div>
</div>
</body>
</html>