<!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>[205659] 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/205659">205659</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-09-08 13:54:24 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't run transitions to or from undefined Lengths
https://bugs.webkit.org/show_bug.cgi?id=161750
rdar://problem/28170460
Reviewed by Zalan Bujtas.
Source/WebCore:
For properties like max-height whose default value is 'none', we would erroneously
attempt to run transitions/animations, and then assert when one of the endpoints
was undefined.
So don't attempt to blend such Length values, just as do when they are auto.
Fixes some transitions on apple.com and developer.apple.com.
Test: transitions/transition-to-from-undefined.html
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimation::blendProperties):
* platform/Length.cpp:
(WebCore::blend):
LayoutTests:
* transitions/transition-to-from-undefined-expected.txt: Added.
* transitions/transition-to-from-undefined.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="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthcpp">trunk/Source/WebCore/platform/Length.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTeststransitionstransitiontofromundefinedexpectedtxt">trunk/LayoutTests/transitions/transition-to-from-undefined-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransitionstransitiontofromundefinedhtml">trunk/LayoutTests/transitions/transition-to-from-undefined.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205658 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-08 20:35:55 UTC (rev 205658)
+++ trunk/LayoutTests/ChangeLog 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-08 Simon Fraser <simon.fraser@apple.com>
+
+ Don't run transitions to or from undefined Lengths
+ https://bugs.webkit.org/show_bug.cgi?id=161750
+ rdar://problem/28170460
+
+ Reviewed by Zalan Bujtas.
+
+ * transitions/transition-to-from-undefined-expected.txt: Added.
+ * transitions/transition-to-from-undefined.html: Added.
+
</ins><span class="cx"> 2016-09-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Support new emoji group candidates
</span></span></pre></div>
<a id="trunkLayoutTeststransitionstransitiontofromundefinedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transitions/transition-to-from-undefined-expected.txt (0 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/transition-to-from-undefined-expected.txt (rev 0)
+++ trunk/LayoutTests/transitions/transition-to-from-undefined-expected.txt 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS - "max-height" property for "test1" element at 1s saw something close to: none
+PASS - "max-height" property for "test2" element at 1s saw something close to: 100
+PASS - "max-height" property for "test3" element at 1s saw something close to: 50
+
</ins></span></pre></div>
<a id="trunkLayoutTeststransitionstransitiontofromundefinedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transitions/transition-to-from-undefined.html (0 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/transition-to-from-undefined.html (rev 0)
+++ trunk/LayoutTests/transitions/transition-to-from-undefined.html 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ position: relative;
+ height: 100px;
+ width: 100px;
+ margin: 10px;
+ background-color: gray;
+ transition: max-height 2s linear;
+ }
+
+ #test1 {
+ max-height: 100px;
+ }
+
+ body.final #test1 {
+ max-height: none;
+ }
+
+ #test2 {
+ max-height: none;
+ }
+
+ body.final #test2 {
+ max-height: 100px
+ }
+
+ #test3 {
+ max-height: 0;
+ }
+
+ body.final #test3 {
+ max-height: 100px
+ }
+ </style>
+ <script src="resources/transition-test-helpers.js"></script>
+ <script type="text/javascript">
+
+ const expectedValues = [
+ // [time, element-id, property, expected-value, tolerance]
+ [1, 'test1', 'max-height', 'none', 2],
+ [1, 'test2', 'max-height', '100', 2],
+ [1, 'test3', 'max-height', '50', 2],
+ ];
+
+ function setupTest()
+ {
+ document.body.classList.add('final');
+ }
+
+ runTransitionTest(expectedValues, setupTest, usePauseAPI);
+ </script>
+</head>
+<body>
+ <div id="test1" class="box"></div>
+ <div id="test2" class="box"></div>
+ <div id="test3" class="box"></div>
+
+ <div id="result"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205658 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-08 20:35:55 UTC (rev 205658)
+++ trunk/Source/WebCore/ChangeLog 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-08 Simon Fraser <simon.fraser@apple.com>
+
+ Don't run transitions to or from undefined Lengths
+ https://bugs.webkit.org/show_bug.cgi?id=161750
+ rdar://problem/28170460
+
+ Reviewed by Zalan Bujtas.
+
+ For properties like max-height whose default value is 'none', we would erroneously
+ attempt to run transitions/animations, and then assert when one of the endpoints
+ was undefined.
+
+ So don't attempt to blend such Length values, just as do when they are auto.
+
+ Fixes some transitions on apple.com and developer.apple.com.
+
+ Test: transitions/transition-to-from-undefined.html
+
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimation::blendProperties):
+ * platform/Length.cpp:
+ (WebCore::blend):
+
</ins><span class="cx"> 2016-09-08 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Support new emoji group candidates
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (205658 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-09-08 20:35:55 UTC (rev 205658)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -1547,10 +1547,10 @@
</span><span class="cx">
</span><span class="cx"> AnimationPropertyWrapperBase* wrapper = CSSPropertyAnimationWrapperMap::singleton().wrapperForProperty(prop);
</span><span class="cx"> if (wrapper) {
</span><del>- wrapper->blend(anim, dst, a, b, progress);
</del><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> wrapper->logBlend(a, b, dst, progress);
</span><span class="cx"> #endif
</span><ins>+ wrapper->blend(anim, dst, a, b, progress);
</ins><span class="cx"> return !wrapper->animationIsAccelerated() || !anim->isAccelerated();
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.cpp (205658 => 205659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.cpp 2016-09-08 20:35:55 UTC (rev 205658)
+++ trunk/Source/WebCore/platform/Length.cpp 2016-09-08 20:54:24 UTC (rev 205659)
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx">
</span><span class="cx"> Length blend(const Length& from, const Length& to, double progress)
</span><span class="cx"> {
</span><del>- if (from.isAuto() || to.isAuto())
</del><ins>+ if (from.isAuto() || from.isUndefined() || to.isAuto() || to.isUndefined())
</ins><span class="cx"> return to;
</span><span class="cx">
</span><span class="cx"> if (from.type() == Calculated || to.type() == Calculated)
</span></span></pre>
</div>
</div>
</body>
</html>