| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 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 UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ | 5 #ifndef UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ |
| 6 #define UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ | 6 #define UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 public: | 50 public: |
| 51 FloodFillInkDropRipple(const gfx::Rect& clip_bounds, | 51 FloodFillInkDropRipple(const gfx::Rect& clip_bounds, |
| 52 const gfx::Point& center_point, | 52 const gfx::Point& center_point, |
| 53 SkColor color, | 53 SkColor color, |
| 54 float visible_opacity); | 54 float visible_opacity); |
| 55 ~FloodFillInkDropRipple() override; | 55 ~FloodFillInkDropRipple() override; |
| 56 | 56 |
| 57 // InkDropRipple: | 57 // InkDropRipple: |
| 58 void SnapToActivated() override; | 58 void SnapToActivated() override; |
| 59 ui::Layer* GetRootLayer() override; | 59 ui::Layer* GetRootLayer() override; |
| 60 bool OverridesHighlight() const override; | |
| 61 | 60 |
| 62 private: | 61 private: |
| 63 friend class test::FloodFillInkDropRippleTestApi; | 62 friend class test::FloodFillInkDropRippleTestApi; |
| 64 | 63 |
| 65 // InkDropRipple: | 64 // InkDropRipple: |
| 66 void AnimateStateChange(InkDropState old_ink_drop_state, | 65 void AnimateStateChange(InkDropState old_ink_drop_state, |
| 67 InkDropState new_ink_drop_state, | 66 InkDropState new_ink_drop_state, |
| 68 ui::LayerAnimationObserver* observer) override; | 67 ui::LayerAnimationObserver* observer) override; |
| 69 void SetStateToHidden() override; | 68 void SetStateToHidden() override; |
| 70 void AbortAllAnimations() override; | 69 void AbortAllAnimations() override; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 125 |
| 127 // The current ink drop state. | 126 // The current ink drop state. |
| 128 InkDropState ink_drop_state_; | 127 InkDropState ink_drop_state_; |
| 129 | 128 |
| 130 DISALLOW_COPY_AND_ASSIGN(FloodFillInkDropRipple); | 129 DISALLOW_COPY_AND_ASSIGN(FloodFillInkDropRipple); |
| 131 }; | 130 }; |
| 132 | 131 |
| 133 } // namespace views | 132 } // namespace views |
| 134 | 133 |
| 135 #endif // UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ | 134 #endif // UI_VIEWS_ANIMATION_FLOOD_FILL_INK_DROP_RIPPLE_H_ |
| OLD | NEW |