| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "gfx/rect.h" | 5 #include "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> | 
| 11 #elif defined(OS_POSIX) | 11 #elif defined(OS_POSIX) | 
| 12 #include <gdk/gdk.h> | 12 #include <gdk/gdk.h> | 
| 13 #endif | 13 #endif | 
| 14 | 14 | 
| 15 #include <ostream> | 15 #include <ostream> | 
| 16 | 16 | 
| 17 #include "base/logging.h" |  | 
| 18 #include "gfx/insets.h" | 17 #include "gfx/insets.h" | 
| 19 | 18 | 
| 20 namespace { | 19 namespace { | 
| 21 | 20 | 
| 22 void AdjustAlongAxis(int dst_origin, int dst_size, int* origin, int* size) { | 21 void AdjustAlongAxis(int dst_origin, int dst_size, int* origin, int* size) { | 
| 23   if (*origin < dst_origin) { | 22   if (*origin < dst_origin) { | 
| 24     *origin = dst_origin; | 23     *origin = dst_origin; | 
| 25     *size = std::min(dst_size, *size); | 24     *size = std::min(dst_size, *size); | 
| 26   } else { | 25   } else { | 
| 27     *size = std::min(dst_size, *size); | 26     *size = std::min(dst_size, *size); | 
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 240              (x() == rect.right() || right() == rect.x())) || | 239              (x() == rect.right() || right() == rect.x())) || | 
| 241          (x() == rect.x() && width() == rect.width() && | 240          (x() == rect.x() && width() == rect.width() && | 
| 242              (y() == rect.bottom() || bottom() == rect.y())); | 241              (y() == rect.bottom() || bottom() == rect.y())); | 
| 243 } | 242 } | 
| 244 | 243 | 
| 245 }  // namespace gfx | 244 }  // namespace gfx | 
| 246 | 245 | 
| 247 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) { | 246 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) { | 
| 248   return out << r.origin() << " " << r.size(); | 247   return out << r.origin() << " " << r.size(); | 
| 249 } | 248 } | 
| OLD | NEW | 
|---|