Changeset 181521 in webkit

Timestamp:

Mar 15, 2015 10:31:28 PM (9 years ago)

Author:

Simon Fraser

Message:

Add the same is<RenderBox> test to KeyframeAnimation::computeExtentOfTransformAnimation()
that ImplicitAnimation::computeExtentOfTransformAnimation() has, and change the latter
to the more canonical is<RenderBox>() form.

Fixes an assertion in animations/animation-on-inline-crash.html

• page/animation/ImplicitAnimation.cpp:

(WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):

• page/animation/KeyframeAnimation.cpp:

(WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/animation/ImplicitAnimation.cpp (modified) (1 diff)
• page/animation/KeyframeAnimation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Add the same is<RenderBox> test to KeyframeAnimation::computeExtentOfTransformAnimation()
+        that ImplicitAnimation::computeExtentOfTransformAnimation() has, and change the latter
+        to the more canonical is<RenderBox>() form.
+        
+        Fixes an assertion in animations/animation-on-inline-crash.html
+
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::computeExtentOfTransformAnimation):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::computeExtentOfTransformAnimation):
+
 2015-03-15  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -105 +105 @@
     ASSERT(hasStyle());
 
-    if (!m_object->isBox())
-        return false;
+    if (!is<RenderBox>(m_object))
+        return true; // Non-boxes don't get transformed;
 
     ASSERT(m_animatingProperty == CSSPropertyWebkitTransform);

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

@@ -204 +204 @@
     ASSERT(m_keyframes.containsProperty(CSSPropertyWebkitTransform));
 
+    if (!is<RenderBox>(m_object))
+        return true; // Non-boxes don't get transformed;
+
     RenderBox& box = downcast<RenderBox>(*m_object);
     FloatRect rendererBox = snapRectToDevicePixels(box.borderBoxRect(), box.document().deviceScaleFactor());