diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:38:29 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:38:29 +0000 |
| commit | 1924d1048439d9990701a28f8709e01c21a08197 (patch) | |
| tree | 5557c8c94257ea22ad69a36b6800a9d38a463a4f /base/gfx/size.cc | |
| parent | 74873f0b403a944de45c4abb2cd6c8ed5a5f4783 (diff) | |
| download | chromium_src-1924d1048439d9990701a28f8709e01c21a08197.zip chromium_src-1924d1048439d9990701a28f8709e01c21a08197.tar.gz chromium_src-1924d1048439d9990701a28f8709e01c21a08197.tar.bz2 | |
Fixing up the basic set of geometry.
Review URL: http://chrome-reviews.prom.corp.google.com/1211
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/size.cc')
| -rw-r--r-- | base/gfx/size.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/base/gfx/size.cc b/base/gfx/size.cc index 153c29e..b7c30b3 100644 --- a/base/gfx/size.cc +++ b/base/gfx/size.cc @@ -29,21 +29,25 @@ #include "base/gfx/size.h" +#if defined(OS_WIN) #include <windows.h> - -#include <ostream> +#elif defined(OS_MACOSX) +#include <CoreGraphics/CGGeometry.h> +#endif namespace gfx { +#if defined(OS_WIN) SIZE Size::ToSIZE() const { SIZE s; s.cx = width_; s.cy = height_; return s; } - -std::ostream& operator<<(std::ostream& out, const gfx::Size& s) { - return out << s.width() << "x" << s.height(); +#elif defined(OS_MACOSX) +CGSize Size::ToCGSize() const { + return CGSizeMake(width_, height_); } +#endif } // namespace gfx |