| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index edfc2da65ea370f87d19a257b608da8453f5d259..4b0934645068467b2a8038a6f164677dc94c0081 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -48,7 +48,6 @@
|
| #include "core/page/Page.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/UseCounter.h"
|
| -#include "core/frame/animation/AnimationController.h"
|
| #include "core/rendering/CompositedLayerMapping.h"
|
| #include "core/rendering/FlowThreadController.h"
|
| #include "core/rendering/HitTestResult.h"
|
| @@ -1799,15 +1798,6 @@ void RenderObject::handleDynamicFloatPositionChange()
|
| }
|
| }
|
|
|
| -void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style)
|
| -{
|
| - if (!isText() && style && !RuntimeEnabledFeatures::webAnimationsCSSEnabled()) {
|
| - setStyle(animation().updateAnimations(*this, *style));
|
| - return;
|
| - }
|
| - setStyle(style);
|
| -}
|
| -
|
| StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff, unsigned contextSensitiveProperties) const
|
| {
|
| // If transform changed, and the layer does not paint into its own separate backing, then we need to do a layout.
|
| @@ -2566,7 +2556,6 @@ void RenderObject::willBeDestroyed()
|
| if (Frame* frame = this->frame()) {
|
| if (frame->page())
|
| frame->page()->autoscrollController().stopAutoscrollIfNeeded(this);
|
| - frame->animation().cancelAnimations(this);
|
| }
|
|
|
| // For accessibility management, notify the parent of the imminent change to its child set.
|
| @@ -3137,11 +3126,6 @@ void RenderObject::adjustRectForOutlineAndShadow(LayoutRect& rect) const
|
| rect.inflate(outlineSize);
|
| }
|
|
|
| -AnimationController& RenderObject::animation() const
|
| -{
|
| - return frame()->animation();
|
| -}
|
| -
|
| bool RenderObject::isInert() const
|
| {
|
| const RenderObject* renderer = this;
|
|
|