Index: Source/core/animation/css/CSSAnimations.cpp |
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp |
index 6a1d9e7de902d7600559a55dd71c16e847cab073..9815033567bd57a3c40afe29f378c6515df74912 100644 |
--- a/Source/core/animation/css/CSSAnimations.cpp |
+++ b/Source/core/animation/css/CSSAnimations.cpp |
@@ -52,7 +52,7 @@ |
#include "core/events/WebKitAnimationEvent.h" |
#include "core/frame/UseCounter.h" |
#include "core/layout/Layer.h" |
-#include "core/rendering/RenderObject.h" |
+#include "core/layout/LayoutObject.h" |
#include "core/rendering/style/KeyframeList.h" |
#include "platform/animation/TimingFunction.h" |
#include "public/platform/Platform.h" |
@@ -519,7 +519,7 @@ void CSSAnimations::calculateTransitionUpdate(CSSAnimationUpdate* update, const |
BitArray<numCSSProperties> listedProperties; |
bool anyTransitionHadTransitionAll = false; |
- const RenderObject* renderer = animatingElement->renderer(); |
+ const LayoutObject* renderer = animatingElement->renderer(); |
dstockwell
2015/02/05 05:31:13
Do you plan to rename these at some point, or will
|
if (!animationStyleRecalc && style.display() != NONE && renderer && renderer->style() && transitionData) { |
const RenderStyle& oldStyle = *renderer->style(); |