Changeset 205659 in webkit

Timestamp:

Sep 8, 2016 1:54:24 PM (8 years ago)

Author:

Simon Fraser

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/transitions/transition-to-from-undefined-expected.txt (added)
• LayoutTests/transitions/transition-to-from-undefined.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/CSSPropertyAnimation.cpp (modified) (1 diff)
• Source/WebCore/platform/Length.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2016-09-08  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-09-08  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

@@ -1548 +1548 @@
     AnimationPropertyWrapperBase* wrapper = CSSPropertyAnimationWrapperMap::singleton().wrapperForProperty(prop);
     if (wrapper) {
-        wrapper->blend(anim, dst, a, b, progress);
 #if !LOG_DISABLED
         wrapper->logBlend(a, b, dst, progress);
 #endif
+        wrapper->blend(anim, dst, a, b, progress);
         return !wrapper->animationIsAccelerated() || !anim->isAccelerated();
     }

trunk/Source/WebCore/platform/Length.cpp

@@ -299 +299 @@
 Length blend(const Length& from, const Length& to, double progress)
 {
-    if (from.isAuto() || to.isAuto())
+    if (from.isAuto() || from.isUndefined() || to.isAuto() || to.isUndefined())
         return to;