Revert of [Oilpan] Prepare full definition of classes before using Member

third_party/WebKit/Source/core/animation/AnimationEffect.h

 /*
  * 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 80 matching lines @@
     bool isInPlay() const { return ensureCalculated().isInPlay; }
     double currentIteration() const { return ensureCalculated().currentIteration; }
     double timeFraction() const { return ensureCalculated().timeFraction; }
     double timeToForwardsEffectChange() const { return ensureCalculated().timeToForwardsEffectChange; }
     double timeToReverseEffectChange() const { return ensureCalculated().timeToReverseEffectChange; }
 
     double iterationDuration() const;
     double activeDurationInternal() const;
     double endTimeInternal() const { return specifiedTiming().startDelay + activeDurationInternal() + specifiedTiming().endDelay; }
 
-    const Animation* animation() const;
-    Animation* animation();
+    const Animation* animation() const { return m_animation; }
+    Animation* animation() { return m_animation; }
     const Timing& specifiedTiming() const { return m_timing; }
     AnimationEffectTiming* timing();
     void updateSpecifiedTiming(const Timing&);
 
     void computedTiming(ComputedTimingProperties&);
     ComputedTimingProperties computedTiming();
 
     void setName(const String& name) { m_name = name; }
     const String& name() const { return m_name; }
 
     DECLARE_VIRTUAL_TRACE();
 
 protected:
     explicit AnimationEffect(const Timing&, EventDelegate* = nullptr);
 
     // When AnimationEffect receives a new inherited time via updateInheritedTime
     // it will (if necessary) recalculate timings and (if necessary) call
     // updateChildrenAndEffects.
-    void updateInheritedTime(double, TimingUpdateReason) const;
+    void updateInheritedTime(double inheritedTime, TimingUpdateReason) const;
     void invalidate() const { m_needsUpdate = true; }
-    bool requiresIterationEvents() const;
-    void clearEventDelegate();
+    bool requiresIterationEvents() const { return m_eventDelegate && m_eventDelegate->requiresIterationEvents(*this); }
+    void clearEventDelegate() { m_eventDelegate = nullptr; }
 
-    virtual void attach(Animation*);
-    virtual void detach();
+    virtual void attach(Animation* animation)
+    {
+        m_animation = animation;
+    }
+
+    virtual void detach()
+    {
+        ASSERT(m_animation);
+        m_animation = nullptr;
+    }
 
     double repeatedDuration() const;
 
     virtual void updateChildrenAndEffects() const = 0;
     virtual double intrinsicIterationDuration() const { return 0; }
     virtual double calculateTimeToEffectChange(bool forwards, double localTime, double timeToNextIteration) const = 0;
     virtual void specifiedTimingChanged() { }
 
     Member<Animation> m_animation;
     Timing m_timing;
@@ skipping 14 matching lines @@
     mutable bool m_needsUpdate;
     mutable double m_lastUpdateTime;
     String m_name;
 
     const CalculatedTiming& ensureCalculated() const;
 };
 
 } // namespace blink
 
 #endif // AnimationEffect_h