Title: [181521] trunk/Source/WebCore
- Revision
- 181521
- Author
- simon.fra...@apple.com
- Date
- 2015-03-15 22:31:28 -0700 (Sun, 15 Mar 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181520 => 181521)
--- trunk/Source/WebCore/ChangeLog 2015-03-16 02:26:47 UTC (rev 181520)
+++ trunk/Source/WebCore/ChangeLog 2015-03-16 05:31:28 UTC (rev 181521)
@@ -1,5 +1,18 @@
2015-03-15 Simon Fraser <simon.fra...@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.fra...@apple.com>
+
And another fix. Thanks to Hunseop Jeong for the fix.
* html/HTMLInputElement.cpp:
Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (181520 => 181521)
--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-03-16 02:26:47 UTC (rev 181520)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2015-03-16 05:31:28 UTC (rev 181521)
@@ -104,8 +104,8 @@
{
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);
Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (181520 => 181521)
--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-03-16 02:26:47 UTC (rev 181520)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-03-16 05:31:28 UTC (rev 181521)
@@ -203,6 +203,9 @@
{
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());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
