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

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

Issue 11081007: Remove implicit flooring Scale() method from Point and Size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/gfx/size_conversions.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SIZE_F_H_ 5 #ifndef UI_GFX_SIZE_F_H_
6 #define UI_GFX_SIZE_F_H_ 6 #define UI_GFX_SIZE_F_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/base/ui_export.h" 10 #include "ui/base/ui_export.h"
11 #include "ui/gfx/size_base.h" 11 #include "ui/gfx/size_base.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 // A floating version of gfx::Size. 15 // A floating version of gfx::Size.
16 class UI_EXPORT SizeF : public SizeBase<SizeF, float> { 16 class UI_EXPORT SizeF : public SizeBase<SizeF, float> {
17 public: 17 public:
18 SizeF(); 18 SizeF();
19 SizeF(float width, float height); 19 SizeF(float width, float height);
20 ~SizeF(); 20 ~SizeF();
21 21
22 SizeF Scale(float scale) const WARN_UNUSED_RESULT {
23 return Scale(scale, scale);
24 }
25
26 SizeF Scale(float x_scale, float y_scale) const WARN_UNUSED_RESULT {
27 return SizeF(width() * x_scale, height() * y_scale);
28 }
29
22 std::string ToString() const; 30 std::string ToString() const;
23 }; 31 };
24 32
25 #if !defined(COMPILER_MSVC) 33 #if !defined(COMPILER_MSVC)
26 extern template class SizeBase<SizeF, float>; 34 extern template class SizeBase<SizeF, float>;
27 #endif 35 #endif
28 36
29 } // namespace gfx 37 } // namespace gfx
30 38
31 #endif // UI_GFX_SIZE_F_H_ 39 #endif // UI_GFX_SIZE_F_H_
OLDNEW
« no previous file with comments | « ui/gfx/size_conversions.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698