<!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>[195103] releases/WebKitGTK/webkit-2.10</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/195103">195103</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 01:31:56 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193610">r193610</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/187121">r187121</a>): Can't get to the main content of the page at https://theintercept.com/drone-papers/
https://bugs.webkit.org/show_bug.cgi?id=151849
rdar://problem/23132828
Reviewed by Zalan Bujtas.
Source/WebCore:
This page uses a fill-forwards animation where the last keyframe has height: auto.
After <a href="http://trac.webkit.org/projects/webkit/changeset/187121">r187121</a>, we tried to blend the height Length value from the last keyframe to the
first keyframe with progress=0 (which should pick up the 'auto' from the last keyframe).
However, Length::blend() just considered both 0 and 'auto' to be zero, and returned
the 0 length.
So fix Length::blend() to return the "from" length if progress is zero.
Test: animations/fill-forwards-auto-height.html
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::blendFunc): Length::blend takes a double, so don't narrow to float.
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::fetchIntervalEndpointsForProperty): Declare two variables
at first use.
* platform/Length.h:
(WebCore::Length::blend):
LayoutTests:
New ref test.
The behavior of imported/blink/transitions/transition-not-interpolable.html changed
with this patch, but that test is trying to determine if transitions run to/from
'auto' values, and doing it wrong. The current patch doesn't change the user-visible
behavior of transitions with 'auto' endpoints (covered by http://webkit.org/b/38243).
* animations/fill-forwards-auto-height-expected.html: Added.
* animations/fill-forwards-auto-height.html: Added.
* imported/blink/transitions/transition-not-interpolable-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastdomshadowremovestylesinshadowcrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/dom/shadow/remove-styles-in-shadow-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageanimationCSSPropertyAnimationcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageanimationKeyframeAnimationcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformLengthh">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/Length.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsanimationsfillforwardsautoheightexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsanimationsfillforwardsautoheighthtml">releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-06 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r187121): Can't get to the main content of the page at https://theintercept.com/drone-papers/
+ https://bugs.webkit.org/show_bug.cgi?id=151849
+ rdar://problem/23132828
+
+ Reviewed by Zalan Bujtas.
+
+ New ref test.
+
+ The behavior of imported/blink/transitions/transition-not-interpolable.html changed
+ with this patch, but that test is trying to determine if transitions run to/from
+ 'auto' values, and doing it wrong. The current patch doesn't change the user-visible
+ behavior of transitions with 'auto' endpoints (covered by http://webkit.org/b/38243).
+
+ * animations/fill-forwards-auto-height-expected.html: Added.
+ * animations/fill-forwards-auto-height.html: Added.
+ * imported/blink/transitions/transition-not-interpolable-expected.txt:
+
</ins><span class="cx"> 2015-12-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Asynchronously call onerror when a content blocker blocks ascript element's load
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsanimationsfillforwardsautoheightexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height-expected.html (0 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height-expected.html 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .landing {
+ width: 300px;
+ overflow: hidden;
+ border: 1px solid black;
+ }
+
+ .contents {
+ height: 300px;
+ background-color: gray;
+ }
+ </style>
+</head>
+<body>
+
+<div class="landing">
+ <div class="contents">
+
+ </div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsanimationsfillforwardsautoheighthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height.html (0 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/animations/fill-forwards-auto-height.html 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ @keyframes reveal {
+ 0%, 50% {
+ height: 0;
+ }
+
+ 100% {
+ height: auto;
+ }
+ }
+
+ .landing {
+ width: 300px;
+ overflow: hidden;
+ border: 1px solid black;
+ animation: reveal 0.01s forwards;
+ }
+
+ .contents {
+ height: 300px;
+ background-color: gray;
+ }
+ </style>
+</head>
+<body>
+<div id="animated" class="landing">
+ <div class="contents"></div>
+</div>
+<script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ document.getElementById('animated').addEventListener('animationend', function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ })
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastdomshadowremovestylesinshadowcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/dom/shadow/remove-styles-in-shadow-crash-expected.txt (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/dom/shadow/remove-styles-in-shadow-crash-expected.txt 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/dom/shadow/remove-styles-in-shadow-crash-expected.txt 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -1 +1 @@
</span><del>-PASS
</del><ins>+FAIL -- transtion should not apply from 0px to auto
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r187121): Can't get to the main content of the page at https://theintercept.com/drone-papers/
+ https://bugs.webkit.org/show_bug.cgi?id=151849
+ rdar://problem/23132828
+
+ Reviewed by Zalan Bujtas.
+
+ This page uses a fill-forwards animation where the last keyframe has height: auto.
+ After r187121, we tried to blend the height Length value from the last keyframe to the
+ first keyframe with progress=0 (which should pick up the 'auto' from the last keyframe).
+
+ However, Length::blend() just considered both 0 and 'auto' to be zero, and returned
+ the 0 length.
+
+ So fix Length::blend() to return the "from" length if progress is zero.
+
+ Test: animations/fill-forwards-auto-height.html
+
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::blendFunc): Length::blend takes a double, so don't narrow to float.
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::fetchIntervalEndpointsForProperty): Declare two variables
+ at first use.
+ * platform/Length.h:
+ (WebCore::Length::blend):
+
+2015-12-06 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Give SVGTransformList some inline vector capacity
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151644
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> static inline Length blendFunc(const AnimationBase*, const Length& from, const Length& to, double progress)
</span><span class="cx"> {
</span><del>- return to.blend(from, narrowPrecisionToFloat(progress));
</del><ins>+ return to.blend(from, progress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline LengthSize blendFunc(const AnimationBase* anim, const LengthSize& from, const LengthSize& to, double progress)
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx"> {
</span><span class="cx"> return to.blend(from, narrowPrecisionToFloat(progress));
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> static inline Vector<SVGLength> blendFunc(const AnimationBase*, const Vector<SVGLength>& from, const Vector<SVGLength>& to, double progress)
</span><span class="cx"> {
</span><span class="cx"> size_t fromLength = from.size();
</span><span class="lines">@@ -1453,7 +1454,6 @@
</span><span class="cx"> wrapper->blend(anim, dst, a, b, progress);
</span><span class="cx"> return !wrapper->animationIsAccelerated() || !anim->isAccelerated();
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/KeyframeAnimation.cpp (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx"> prevIndex = i;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- double scale = 1;
- double offset = 0;
-
</del><span class="cx"> if (prevIndex == -1)
</span><span class="cx"> prevIndex = 0;
</span><span class="cx">
</span><span class="lines">@@ -122,8 +119,8 @@
</span><span class="cx"> fromStyle = prevKeyframe.style();
</span><span class="cx"> toStyle = nextKeyframe.style();
</span><span class="cx">
</span><del>- offset = prevKeyframe.key();
- scale = 1.0 / (nextKeyframe.key() - prevKeyframe.key());
</del><ins>+ double offset = prevKeyframe.key();
+ double scale = 1.0 / (nextKeyframe.key() - prevKeyframe.key());
</ins><span class="cx">
</span><span class="cx"> prog = progress(scale, offset, prevKeyframe.timingFunction(name()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformLengthh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/Length.h (195102 => 195103)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/Length.h 2016-01-15 09:15:12 UTC (rev 195102)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/Length.h 2016-01-15 09:31:56 UTC (rev 195103)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> return blendMixedTypes(from, progress);
</span><span class="cx">
</span><span class="cx"> if (from.isZero() && isZero())
</span><del>- return *this;
</del><ins>+ return progress ? *this : from; // Pick up 'auto' from 'from' if progress is zero.
</ins><span class="cx">
</span><span class="cx"> LengthType resultType = type();
</span><span class="cx"> if (isZero())
</span></span></pre>
</div>
</div>
</body>
</html>