| OLD | NEW |
| 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/geometry/rect.h" | 5 #include "ui/gfx/geometry/rect.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
| 10 #include <windows.h> | 10 #include <windows.h> |
| 11 #elif defined(OS_IOS) | 11 #elif defined(OS_IOS) |
| 12 #include <CoreGraphics/CoreGraphics.h> | 12 #include <CoreGraphics/CoreGraphics.h> |
| 13 #elif defined(OS_MACOSX) | 13 #elif defined(OS_MACOSX) |
| 14 #include <ApplicationServices/ApplicationServices.h> | 14 #include <ApplicationServices/ApplicationServices.h> |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #include "base/logging.h" | 17 #include "base/logging.h" |
| 18 #include "base/strings/stringprintf.h" | 18 #include "base/strings/stringprintf.h" |
| 19 #include "build/build_config.h" |
| 19 #include "ui/gfx/geometry/insets.h" | 20 #include "ui/gfx/geometry/insets.h" |
| 20 | 21 |
| 21 namespace gfx { | 22 namespace gfx { |
| 22 | 23 |
| 23 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
| 24 Rect::Rect(const RECT& r) | 25 Rect::Rect(const RECT& r) |
| 25 : origin_(r.left, r.top), | 26 : origin_(r.left, r.top), |
| 26 size_(std::abs(r.right - r.left), std::abs(r.bottom - r.top)) { | 27 size_(std::abs(r.right - r.left), std::abs(r.bottom - r.top)) { |
| 27 } | 28 } |
| 28 #elif defined(OS_MACOSX) | 29 #elif defined(OS_MACOSX) |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 | 284 |
| 284 Rect BoundingRect(const Point& p1, const Point& p2) { | 285 Rect BoundingRect(const Point& p1, const Point& p2) { |
| 285 int rx = std::min(p1.x(), p2.x()); | 286 int rx = std::min(p1.x(), p2.x()); |
| 286 int ry = std::min(p1.y(), p2.y()); | 287 int ry = std::min(p1.y(), p2.y()); |
| 287 int rr = std::max(p1.x(), p2.x()); | 288 int rr = std::max(p1.x(), p2.x()); |
| 288 int rb = std::max(p1.y(), p2.y()); | 289 int rb = std::max(p1.y(), p2.y()); |
| 289 return Rect(rx, ry, rr - rx, rb - ry); | 290 return Rect(rx, ry, rr - rx, rb - ry); |
| 290 } | 291 } |
| 291 | 292 |
| 292 } // namespace gfx | 293 } // namespace gfx |
| OLD | NEW |