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

Side by Side Diff: ui/gfx/interpolated_transform.h

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_GFX_INTERPOLATED_TRANSFORM_H_ 5 #ifndef UI_GFX_INTERPOLATED_TRANSFORM_H_
6 #define UI_GFX_INTERPOLATED_TRANSFORM_H_ 6 #define UI_GFX_INTERPOLATED_TRANSFORM_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ui/gfx/geometry/point.h" 10 #include "ui/gfx/geometry/point.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 private: 157 private:
158 const gfx::Point3F start_scale_; 158 const gfx::Point3F start_scale_;
159 const gfx::Point3F end_scale_; 159 const gfx::Point3F end_scale_;
160 160
161 DISALLOW_COPY_AND_ASSIGN(InterpolatedScale); 161 DISALLOW_COPY_AND_ASSIGN(InterpolatedScale);
162 }; 162 };
163 163
164 class GFX_EXPORT InterpolatedTranslation : public InterpolatedTransform { 164 class GFX_EXPORT InterpolatedTranslation : public InterpolatedTransform {
165 public: 165 public:
166 InterpolatedTranslation(const gfx::Point& start_pos, 166 InterpolatedTranslation(const gfx::PointF& start_pos,
167 const gfx::Point& end_pos); 167 const gfx::PointF& end_pos);
168 InterpolatedTranslation(const gfx::Point& start_pos, 168 InterpolatedTranslation(const gfx::PointF& start_pos,
169 const gfx::Point& end_pos, 169 const gfx::PointF& end_pos,
170 float start_time, 170 float start_time,
171 float end_time); 171 float end_time);
172 InterpolatedTranslation(const gfx::Point3F& start_pos, 172 InterpolatedTranslation(const gfx::Point3F& start_pos,
173 const gfx::Point3F& end_pos); 173 const gfx::Point3F& end_pos);
174 InterpolatedTranslation(const gfx::Point3F& start_pos, 174 InterpolatedTranslation(const gfx::Point3F& start_pos,
175 const gfx::Point3F& end_pos, 175 const gfx::Point3F& end_pos,
176 float start_time, 176 float start_time,
177 float end_time); 177 float end_time);
178 ~InterpolatedTranslation() override; 178 ~InterpolatedTranslation() override;
179 179
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 void Init(const gfx::Transform& start_transform, 262 void Init(const gfx::Transform& start_transform,
263 const gfx::Transform& end_transform); 263 const gfx::Transform& end_transform);
264 264
265 gfx::DecomposedTransform start_decomp_; 265 gfx::DecomposedTransform start_decomp_;
266 gfx::DecomposedTransform end_decomp_; 266 gfx::DecomposedTransform end_decomp_;
267 }; 267 };
268 268
269 } // namespace ui 269 } // namespace ui
270 270
271 #endif // UI_GFX_INTERPOLATED_TRANSFORM_H_ 271 #endif // UI_GFX_INTERPOLATED_TRANSFORM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698