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

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

Issue 23498059: Remove last dependencies on ui/base from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last rebase Created 7 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.h ('k') | ui/gfx/skbitmap_operations.h » ('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 "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "ui/gfx/gfx_export.h" 11 #include "ui/gfx/gfx_export.h"
12 #include "ui/gfx/size_base.h" 12 #include "ui/gfx/size_base.h"
13 13
14 namespace gfx { 14 namespace gfx {
15 15
16 // A floating version of gfx::Size. 16 // A floating version of gfx::Size.
17 class UI_EXPORT SizeF : public SizeBase<SizeF, float> { 17 class GFX_EXPORT SizeF : public SizeBase<SizeF, float> {
18 public: 18 public:
19 SizeF() : SizeBase<SizeF, float>(0, 0) {} 19 SizeF() : SizeBase<SizeF, float>(0, 0) {}
20 SizeF(float width, float height) : SizeBase<SizeF, float>(width, height) {} 20 SizeF(float width, float height) : SizeBase<SizeF, float>(width, height) {}
21 ~SizeF() {} 21 ~SizeF() {}
22 22
23 void Scale(float scale) { 23 void Scale(float scale) {
24 Scale(scale, scale); 24 Scale(scale, scale);
25 } 25 }
26 26
27 void Scale(float x_scale, float y_scale) { 27 void Scale(float x_scale, float y_scale) {
28 SetSize(width() * x_scale, height() * y_scale); 28 SetSize(width() * x_scale, height() * y_scale);
29 } 29 }
30 30
31 std::string ToString() const; 31 std::string ToString() const;
32 }; 32 };
33 33
34 inline bool operator==(const SizeF& lhs, const SizeF& rhs) { 34 inline bool operator==(const SizeF& lhs, const SizeF& rhs) {
35 return lhs.width() == rhs.width() && lhs.height() == rhs.height(); 35 return lhs.width() == rhs.width() && lhs.height() == rhs.height();
36 } 36 }
37 37
38 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) { 38 inline bool operator!=(const SizeF& lhs, const SizeF& rhs) {
39 return !(lhs == rhs); 39 return !(lhs == rhs);
40 } 40 }
41 41
42 UI_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale); 42 GFX_EXPORT SizeF ScaleSize(const SizeF& p, float x_scale, float y_scale);
43 43
44 inline SizeF ScaleSize(const SizeF& p, float scale) { 44 inline SizeF ScaleSize(const SizeF& p, float scale) {
45 return ScaleSize(p, scale, scale); 45 return ScaleSize(p, scale, scale);
46 } 46 }
47 47
48 #if !defined(COMPILER_MSVC) 48 #if !defined(COMPILER_MSVC)
49 extern template class SizeBase<SizeF, float>; 49 extern template class SizeBase<SizeF, float>;
50 #endif 50 #endif
51 51
52 } // namespace gfx 52 } // namespace gfx
53 53
54 #endif // UI_GFX_SIZE_F_H_ 54 #endif // UI_GFX_SIZE_F_H_
OLDNEW
« no previous file with comments | « ui/gfx/size_conversions.h ('k') | ui/gfx/skbitmap_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698