Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / compositor / layer_animation_observer.h

diff --git a/src/ui/compositor/layer_animation_observer.h b/src/ui/compositor/layer_animation_observer.h
index 9ae389d..35253d3 100644 (file)
--- a/src/ui/compositor/layer_animation_observer.h
+++ b/src/ui/compositor/layer_animation_observer.h
@@ -43,7 +43,7 @@ class COMPOSITOR_EXPORT LayerAnimationObserver  {
 
   // If the animator is destroyed during an animation, the animations are
   // aborted. The resulting NotifyAborted notifications will NOT be sent to
-  // this observer if this function returns false. NOTE: IF YOU OVERRIDE THIS
+  // this observer if this function returns false. NOTE: IF YOU override THIS
   // FUNCTION TO RETURN TRUE, YOU MUST REMEMBER TO REMOVE YOURSELF AS AN
   // OBSERVER WHEN YOU ARE DESTROYED.
   virtual bool RequiresNotificationWhenAnimatorDestroyed() const;
@@ -82,7 +82,7 @@ class COMPOSITOR_EXPORT ImplicitAnimationObserver
     : public LayerAnimationObserver {
  public:
   ImplicitAnimationObserver();
-  virtual ~ImplicitAnimationObserver();
+  ~ImplicitAnimationObserver() override;
 
   // Called when the first animation sequence has started.
   virtual void OnImplicitAnimationsScheduled() {}
@@ -116,16 +116,11 @@ class COMPOSITOR_EXPORT ImplicitAnimationObserver
   friend class ScopedLayerAnimationSettings;
 
   // LayerAnimationObserver implementation
-  virtual void OnLayerAnimationEnded(
-      LayerAnimationSequence* sequence) OVERRIDE;
-  virtual void OnLayerAnimationAborted(
-      LayerAnimationSequence* sequence) OVERRIDE;
-  virtual void OnLayerAnimationScheduled(
-      LayerAnimationSequence* sequence) OVERRIDE;
-  virtual void OnAttachedToSequence(
-      LayerAnimationSequence* sequence) OVERRIDE;
-  virtual void OnDetachedFromSequence(
-      LayerAnimationSequence* sequence) OVERRIDE;
+  void OnLayerAnimationEnded(LayerAnimationSequence* sequence) override;
+  void OnLayerAnimationAborted(LayerAnimationSequence* sequence) override;
+  void OnLayerAnimationScheduled(LayerAnimationSequence* sequence) override;
+  void OnAttachedToSequence(LayerAnimationSequence* sequence) override;
+  void OnDetachedFromSequence(LayerAnimationSequence* sequence) override;
 
   // OnImplicitAnimationsCompleted is not fired unless the observer is active.
   bool active() const { return active_; }