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

public/platform/WebLayer.h

 /*
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 #include "WebSize.h"
 #include "WebString.h"
 #include "WebVector.h"
 
 class SkMatrix44;
 class SkImageFilter;
 
 namespace blink {
 
-class WebCompositorAnimationDelegate;
 class WebFilterOperations;
 class WebLayerClient;
 class WebLayerScrollClient;
 struct WebFloatPoint;
 struct WebFloatRect;
 struct WebLayerPositionConstraint;
 
 class WebLayer {
 public:
     virtual ~WebLayer() { }
@@ skipping 69 matching lines @@
     virtual WebColor backgroundColor() const = 0;
 
     // Clear the filters in use by passing in a newly instantiated
     // WebFilterOperations object.
     virtual void setFilters(const WebFilterOperations&) = 0;
 
     // An animation delegate is notified when animations are started and
     // 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;
 
     // Returns true if this layer has any active animations - useful for tests.
     virtual bool hasActiveAnimation() = 0;
 
     // If a scroll parent is set, this layer will inherit its parent's scroll
     // delta and offset even though it will not be a descendant of the scroll
     // in the layer hierarchy.
@@ skipping 51 matching lines @@
 
     // True if the layer is not part of a tree attached to a WebLayerTreeView.
     virtual bool isOrphan() const = 0;
 
     virtual void setWebLayerClient(WebLayerClient*) = 0;
 };
 
 } // namespace blink
 
 #endif // WebLayer_h