| 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_SQUARE_INK_DROP_ANIMATION_H_ | 5 #ifndef UI_VIEWS_ANIMATION_SQUARE_INK_DROP_ANIMATION_H_ |
| 6 #define UI_VIEWS_ANIMATION_SQUARE_INK_DROP_ANIMATION_H_ | 6 #define UI_VIEWS_ANIMATION_SQUARE_INK_DROP_ANIMATION_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 // An ink drop animation that smoothly animates between a circle and a rounded | 36 // An ink drop animation that smoothly animates between a circle and a rounded |
| 37 // rectangle of different sizes for each of the different InkDropStates. The | 37 // rectangle of different sizes for each of the different InkDropStates. The |
| 38 // final frame for each InkDropState will be bounded by either a |large_size_| | 38 // final frame for each InkDropState will be bounded by either a |large_size_| |
| 39 // rectangle or a |small_size_| rectangle. | 39 // rectangle or a |small_size_| rectangle. |
| 40 // | 40 // |
| 41 // The valid InkDropState transitions are defined below: | 41 // The valid InkDropState transitions are defined below: |
| 42 // | 42 // |
| 43 // {All InkDropStates} => HIDDEN | 43 // {All InkDropStates} => HIDDEN |
| 44 // HIDDEN => ACTION_PENDING | 44 // HIDDEN => ACTION_PENDING |
| 45 // HIDDEN, ACTION_PENDING => QUICK_ACTION | 45 // HIDDEN, ACTION_PENDING => ACTION_TRIGGERED |
| 46 // ACTION_PENDING => SLOW_ACTION_PENDING | 46 // ACTION_PENDING => ALTERNATE_ACTION_PENDING |
| 47 // SLOW_ACTION_PENDING => SLOW_ACTION | 47 // ALTERNATE_ACTION_PENDING => ALTERNATE_ACTION_TRIGGERED |
| 48 // {All InkDropStates} => ACTIVATED | 48 // {All InkDropStates} => ACTIVATED |
| 49 // {All InkDropStates} => DEACTIVATED | 49 // {All InkDropStates} => DEACTIVATED |
| 50 // | 50 // |
| 51 class VIEWS_EXPORT SquareInkDropAnimation : public InkDropAnimation { | 51 class VIEWS_EXPORT SquareInkDropAnimation : public InkDropAnimation { |
| 52 public: | 52 public: |
| 53 SquareInkDropAnimation(const gfx::Size& large_size, | 53 SquareInkDropAnimation(const gfx::Size& large_size, |
| 54 int large_corner_radius, | 54 int large_corner_radius, |
| 55 const gfx::Size& small_size, | 55 const gfx::Size& small_size, |
| 56 int small_corner_radius, | 56 int small_corner_radius, |
| 57 const gfx::Point& center_point, | 57 const gfx::Point& center_point, |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 | 175 |
| 176 // ui::Layers for all of the painted shape layers that compose the ink drop. | 176 // ui::Layers for all of the painted shape layers that compose the ink drop. |
| 177 scoped_ptr<ui::Layer> painted_layers_[PAINTED_SHAPE_COUNT]; | 177 scoped_ptr<ui::Layer> painted_layers_[PAINTED_SHAPE_COUNT]; |
| 178 | 178 |
| 179 DISALLOW_COPY_AND_ASSIGN(SquareInkDropAnimation); | 179 DISALLOW_COPY_AND_ASSIGN(SquareInkDropAnimation); |
| 180 }; | 180 }; |
| 181 | 181 |
| 182 } // namespace views | 182 } // namespace views |
| 183 | 183 |
| 184 #endif // UI_VIEWS_ANIMATION_SQUARE_INK_DROP_ANIMATION_H_ | 184 #endif // UI_VIEWS_ANIMATION_SQUARE_INK_DROP_ANIMATION_H_ |
| OLD | NEW |