Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / animation / layer_animation_controller.h

diff --git a/src/cc/animation/layer_animation_controller.h b/src/cc/animation/layer_animation_controller.h
index 1717c0e..01fce98 100644 (file)
--- a/src/cc/animation/layer_animation_controller.h
+++ b/src/cc/animation/layer_animation_controller.h
@@ -15,6 +15,7 @@
 #include "cc/animation/layer_animation_event_observer.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
+#include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
@@ -105,7 +106,7 @@ class CC_EXPORT LayerAnimationController
 
   void remove_value_provider(LayerAnimationValueProvider* provider) {
     if (value_provider_ == provider)
-      value_provider_ = NULL;
+      value_provider_ = nullptr;
   }
 
   void set_layer_animation_delegate(AnimationDelegate* delegate) {
@@ -114,7 +115,7 @@ class CC_EXPORT LayerAnimationController
 
   void remove_layer_animation_delegate(AnimationDelegate* delegate) {
     if (layer_animation_delegate_ == delegate)
-      layer_animation_delegate_ = NULL;
+      layer_animation_delegate_ = nullptr;
   }
 
   bool HasFilterAnimationThatInflatesBounds() const;
@@ -183,9 +184,10 @@ class CC_EXPORT LayerAnimationController
   void NotifyObserversFilterAnimated(const FilterOperations& filter,
                                      bool notify_active_observers,
                                      bool notify_pending_observers);
-  void NotifyObserversScrollOffsetAnimated(const gfx::Vector2dF& scroll_offset,
-                                           bool notify_active_observers,
-                                           bool notify_pending_observers);
+  void NotifyObserversScrollOffsetAnimated(
+      const gfx::ScrollOffset& scroll_offset,
+      bool notify_active_observers,
+      bool notify_pending_observers);
 
   void NotifyObserversAnimationWaitingForDeletion();