Rename LayoutStyle to papayawhip

Source/core/animation/Animation.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/animation/AnimationPlayer.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/AnimationTimingProperties.h"
 #include "core/animation/CompositorAnimations.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/Interpolation.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/dom/Element.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/frame/UseCounter.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 
 namespace blink {
 
 PassRefPtrWillBeRawPtr<Animation> Animation::create(Element* target, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtrWillBeRawPtr<EventDelegate> eventDelegate)
 {
     return adoptRefWillBeNoop(new Animation(target, effect, timing, priority, eventDelegate));
 }
 
@@ skipping 73 matching lines @@
 }
 
 void Animation::applyEffects()
 {
     ASSERT(isInEffect());
     ASSERT(player());
     if (!m_target || !m_effect)
         return;
 
     // Cancel composited animation of transform if a motion path has been introduced on the element.
-    if (m_target->layoutStyle()
-        && m_target->layoutStyle()->hasMotionPath()
+    if (m_target->computedStyle()
+        && m_target->computedStyle()->hasMotionPath()
         && player()->hasActiveAnimationsOnCompositor()
         && player()->affects(*m_target, CSSPropertyTransform)) {
         player()->cancelAnimationOnCompositor();
     }
 
     double iteration = currentIteration();
     ASSERT(iteration >= 0);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations = m_sampledEffect ? m_sampledEffect->mutableInterpolations() : nullptr;
     // FIXME: Handle iteration values which overflow int.
     m_effect->sample(static_cast<int>(iteration), timeFraction(), iterationDuration(), interpolations);
@@ skipping 81 matching lines @@
     m_sampledEffect = nullptr;
     if (sampledEffect)
         sampledEffect->clear();
 }
 #endif
 
 bool Animation::isCandidateForAnimationOnCompositor(double playerPlaybackRate) const
 {
     if (!effect()
         || !m_target
-        || (m_target->layoutStyle() && m_target->layoutStyle()->hasMotionPath()))
+        || (m_target->computedStyle() && m_target->computedStyle()->hasMotionPath()))
         return false;
 
     return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, player(), *effect(), playerPlaybackRate);
 }
 
 bool Animation::maybeStartAnimationOnCompositor(int group, double startTime, double currentTime, double playerPlaybackRate)
 {
     ASSERT(!hasActiveAnimationsOnCompositor());
     if (!isCandidateForAnimationOnCompositor(playerPlaybackRate))
         return false;
@@ skipping 59 matching lines @@
 
 DEFINE_TRACE(Animation)
 {
     visitor->trace(m_target);
     visitor->trace(m_effect);
     visitor->trace(m_sampledEffect);
     AnimationNode::trace(visitor);
 }
 
 } // namespace blink