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

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

Issue 10993094: Make adding and subtracting gfx:: point types simpler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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_f.h ('k') | no next file » | 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 #include "ui/gfx/size_f.h" 5 #include "ui/gfx/size_f.h"
6 6
7 #include <cmath>
8
9 #include "base/logging.h" 7 #include "base/logging.h"
10 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
11 #include "ui/gfx/size.h"
12 9
13 namespace gfx { 10 namespace gfx {
14 11
15 template class SizeBase<SizeF, float>; 12 template class SizeBase<SizeF, float>;
16 13
17 SizeF::SizeF() : SizeBase<SizeF, float>(0, 0) {} 14 SizeF::SizeF() : SizeBase<SizeF, float>(0, 0) {}
18 15
19 SizeF::SizeF(float width, float height) : SizeBase<SizeF, float>(0, 0) { 16 SizeF::SizeF(float width, float height) : SizeBase<SizeF, float>(0, 0) {
20 set_width(width); 17 set_width(width);
21 set_height(height); 18 set_height(height);
22 } 19 }
23 20
24 SizeF::~SizeF() {} 21 SizeF::~SizeF() {}
25 22
26 Size SizeF::ToSize() const {
27 return Size(static_cast<int>(std::floor(width())),
28 static_cast<int>(std::floor(height())));
29 }
30
31 std::string SizeF::ToString() const { 23 std::string SizeF::ToString() const {
32 return base::StringPrintf("%fx%f", width(), height()); 24 return base::StringPrintf("%fx%f", width(), height());
33 } 25 }
34 26
35 } // namespace gfx 27 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/size_f.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698