| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/rect.h" | 5 #include "ui/gfx/rect.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #elif defined(OS_MACOSX) | 9 #elif defined(OS_MACOSX) |
| 10 #include <CoreGraphics/CGGeometry.h> | 10 #include <CoreGraphics/CGGeometry.h> |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 } | 267 } |
| 268 | 268 |
| 269 bool Rect::SharesEdgeWith(const gfx::Rect& rect) const { | 269 bool Rect::SharesEdgeWith(const gfx::Rect& rect) const { |
| 270 return (y() == rect.y() && height() == rect.height() && | 270 return (y() == rect.y() && height() == rect.height() && |
| 271 (x() == rect.right() || right() == rect.x())) || | 271 (x() == rect.right() || right() == rect.x())) || |
| 272 (x() == rect.x() && width() == rect.width() && | 272 (x() == rect.x() && width() == rect.width() && |
| 273 (y() == rect.bottom() || bottom() == rect.y())); | 273 (y() == rect.bottom() || bottom() == rect.y())); |
| 274 } | 274 } |
| 275 | 275 |
| 276 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) { | 276 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) { |
| 277 return out << r.origin().ToString() << " " << r.size(); | 277 return out << r.origin().ToString() << " " << r.size().ToString(); |
| 278 } | 278 } |
| 279 | 279 |
| 280 } // namespace gfx | 280 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8038024:
ui/gfx: Add ToString() function to Size class. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src