Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: ui/views/animation/ink_drop_animation.h

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_INK_DROP_ANIMATION_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 // Sets the |transforms| on all of the shape layers. Note that this does not 91 // Sets the |transforms| on all of the shape layers. Note that this does not
92 // perform any animation. 92 // perform any animation.
93 void SetTransforms(const InkDropTransforms transforms); 93 void SetTransforms(const InkDropTransforms transforms);
94 94
95 // Sets the opacity of the ink drop. 95 // Sets the opacity of the ink drop.
96 void SetOpacity(float opacity); 96 void SetOpacity(float opacity);
97 97
98 // Updates all of the Transforms in |transforms_out| for a circle of the given 98 // Updates all of the Transforms in |transforms_out| for a circle of the given
99 // |size|. 99 // |size|.
100 void CalculateCircleTransforms(const gfx::SizeF& size, 100 void CalculateCircleTransforms(const gfx::Size& size,
101 InkDropTransforms* transforms_out) const; 101 InkDropTransforms* transforms_out) const;
102 102
103 // Updates all of the Transforms in |transforms_out| for a rounded rectangle 103 // Updates all of the Transforms in |transforms_out| for a rounded rectangle
104 // of the given |size| and |corner_radius|. 104 // of the given |size| and |corner_radius|.
105 void CalculateRectTransforms(const gfx::SizeF& size, 105 void CalculateRectTransforms(const gfx::Size& size,
106 float corner_radius, 106 float corner_radius,
107 InkDropTransforms* transforms_out) const; 107 InkDropTransforms* transforms_out) const;
108 108
109 // Updates all of the Transforms in |transforms_out| to the current target 109 // Updates all of the Transforms in |transforms_out| to the current target
110 // Transforms of the Layers. 110 // Transforms of the Layers.
111 void GetCurrentTansforms(InkDropTransforms* transforms_out) const; 111 void GetCurrentTansforms(InkDropTransforms* transforms_out) const;
112 112
113 // Adds and configures a new |painted_shape| layer to |painted_layers_|. 113 // Adds and configures a new |painted_shape| layer to |painted_layers_|.
114 void AddPaintLayer(PaintedShape painted_shape); 114 void AddPaintLayer(PaintedShape painted_shape);
115 115
(...skipping 29 matching lines...) Expand all
145 145
146 // The current ink drop state. 146 // The current ink drop state.
147 InkDropState ink_drop_state_; 147 InkDropState ink_drop_state_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(InkDropAnimation); 149 DISALLOW_COPY_AND_ASSIGN(InkDropAnimation);
150 }; 150 };
151 151
152 } // namespace views 152 } // namespace views
153 153
154 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_H_ 154 #endif // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/egltest/ozone_platform_egltest.cc ('k') | ui/views/animation/ink_drop_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698