Revert of Rename WebAnimation to WebCompositorAnimation (patchset #5 of https://codereview.chromium…

public/platform/WebLayer.h

Index: public/platform/WebLayer.h
diff --git a/public/platform/WebLayer.h b/public/platform/WebLayer.h
index 5fbf141eafc2fd2f1194b9e5e4ec65da951a07da..904cf60705d2917d37b472241d89d54d18f2c89f 100644
--- a/public/platform/WebLayer.h
+++ b/public/platform/WebLayer.h
@@ -26,10 +26,11 @@
 #ifndef WebLayer_h
 #define WebLayer_h
 
+#include "WebAnimation.h"
 #include "WebBlendMode.h"
 #include "WebColor.h"
 #include "WebCommon.h"
-#include "WebCompositorAnimation.h"
+#include "WebCompositorAnimationDelegate.h"
 #include "WebFloatPoint3D.h"
 #include "WebPoint.h"
 #include "WebRect.h"
@@ -42,7 +43,6 @@ class SkImageFilter;
 
 namespace blink {
 
-class WebCompositorAnimationDelegate;
 class WebFilterOperations;
 class WebLayerClient;
 class WebLayerScrollClient;
@@ -132,18 +132,18 @@ public:
     // stopped. The WebLayer does not take ownership of the delegate, and it is
     // the responsibility of the client to reset the layer's delegate before
     // deleting the delegate.
-    virtual void setAnimationDelegate(WebCompositorAnimationDelegate*) = 0;
+    virtual void setAnimationDelegate(WebAnimationDelegate*) = 0;
 
 
     // Returns false if the animation cannot be added.
-    // Takes ownership of the WebCompositorAnimation object.
+    // Takes ownership of the WebAnimation object.
     virtual bool addAnimation(WebCompositorAnimation*) = 0;
 
     // Removes all animations with the given id.
     virtual void removeAnimation(int animationId) = 0;
 
     // Removes all animations with the given id targeting the given property.
-    virtual void removeAnimation(int animationId, WebCompositorAnimation::TargetProperty) = 0;
+    virtual void removeAnimation(int animationId, WebAnimation::TargetProperty) = 0;
 
     // Pauses all animations with the given id.
     virtual void pauseAnimation(int animationId, double timeOffset) = 0;