| OLD | NEW |
| 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ | 5 #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ |
| 6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ | 6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ |
| 7 | 7 |
| 8 #include <unordered_map> |
| 9 |
| 8 #include "cc/animation/scroll_offset_animations_impl.h" | 10 #include "cc/animation/scroll_offset_animations_impl.h" |
| 9 #include "cc/trees/mutator_host_client.h" | 11 #include "cc/trees/mutator_host_client.h" |
| 10 | 12 |
| 11 namespace cc { | 13 namespace cc { |
| 12 | 14 |
| 13 // A ScrollOffsetAnimationUpdate represents a change on the main thread | 15 // A ScrollOffsetAnimationUpdate represents a change on the main thread |
| 14 // that may impact an impl-only scroll offset animation. | 16 // that may impact an impl-only scroll offset animation. |
| 15 // Note that this class only exists on the main thread. | 17 // Note that this class only exists on the main thread. |
| 16 struct CC_EXPORT ScrollOffsetAnimationUpdate { | 18 struct CC_EXPORT ScrollOffsetAnimationUpdate { |
| 17 enum Type { SCROLL_OFFSET_CHANGED }; | 19 ScrollOffsetAnimationUpdate(); |
| 20 explicit ScrollOffsetAnimationUpdate(ElementId); |
| 18 | 21 |
| 19 ScrollOffsetAnimationUpdate(Type, ElementId); | |
| 20 | |
| 21 Type type_; | |
| 22 // The element to which this update applies. | 22 // The element to which this update applies. |
| 23 ElementId element_id_; | 23 ElementId element_id_; |
| 24 | 24 |
| 25 // The amount by which the scroll offset is changed on the main thread. | 25 // The amount by which the scroll offset is changed on the main thread. |
| 26 gfx::Vector2dF adjustment_; | 26 gfx::Vector2dF adjustment_; |
| 27 |
| 28 // If set to true, abort the currently running impl only scroll offset |
| 29 // animation running on cc and finish it on the main thread. |
| 30 bool takeover_; |
| 27 }; | 31 }; |
| 28 | 32 |
| 29 // ScrollOffsetAnimations contains a list of ScrollOffsetAnimationUpdates. | 33 // ScrollOffsetAnimations contains a list of ScrollOffsetAnimationUpdates. |
| 30 // PushPropertiesTo is called during commit time and the necessary update is | 34 // PushPropertiesTo is called during commit time and the necessary update is |
| 31 // made to the impl-only animation. | 35 // made to the impl-only animation. |
| 32 class CC_EXPORT ScrollOffsetAnimations { | 36 class CC_EXPORT ScrollOffsetAnimations { |
| 33 public: | 37 public: |
| 34 explicit ScrollOffsetAnimations(AnimationHost* animation_host); | 38 explicit ScrollOffsetAnimations(AnimationHost* animation_host); |
| 35 ~ScrollOffsetAnimations(); | 39 ~ScrollOffsetAnimations(); |
| 36 | 40 |
| 37 void AddUpdate(ScrollOffsetAnimationUpdate); | 41 void AddAdjustmentUpdate(ElementId, gfx::Vector2dF adjustment); |
| 42 void AddTakeoverUpdate(ElementId); |
| 43 |
| 38 bool HasUpdatesForTesting() const; | 44 bool HasUpdatesForTesting() const; |
| 39 | 45 |
| 40 // Goes through the updates in the order in which they're added and calls the | 46 // Goes through the updates in the order in which they're added and calls the |
| 41 // appropriate handler for each update. | 47 // appropriate handler for each update. |
| 42 void PushPropertiesTo(ScrollOffsetAnimationsImpl*); | 48 void PushPropertiesTo(ScrollOffsetAnimationsImpl*); |
| 43 | 49 |
| 44 private: | 50 private: |
| 45 using UpdatesQueue = std::vector<ScrollOffsetAnimationUpdate>; | 51 ScrollOffsetAnimationUpdate GetUpdateForElementId(ElementId) const; |
| 46 UpdatesQueue queue_; | 52 |
| 53 using ElementToUpdateMap = |
| 54 std::unordered_map<ElementId, ScrollOffsetAnimationUpdate>; |
| 55 ElementToUpdateMap element_to_update_map_; |
| 47 | 56 |
| 48 AnimationHost* animation_host_; | 57 AnimationHost* animation_host_; |
| 49 }; | 58 }; |
| 50 | 59 |
| 51 } // namespace cc | 60 } // namespace cc |
| 52 | 61 |
| 53 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ | 62 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATIONS_H_ |
| OLD | NEW |