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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/rect.h ('k') | ui/gfx/rect_unittest.cc » ('j') | 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) 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 "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>
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 "gfx/insets.h" 17 #include "ui/gfx/insets.h"
18 18
19 namespace { 19 namespace {
20 20
21 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) {
22 if (*origin < dst_origin) { 22 if (*origin < dst_origin) {
23 *origin = dst_origin; 23 *origin = dst_origin;
24 *size = std::min(dst_size, *size); 24 *size = std::min(dst_size, *size);
25 } else { 25 } else {
26 *size = std::min(dst_size, *size); 26 *size = std::min(dst_size, *size);
27 *origin = std::min(dst_origin + dst_size, *origin + *size) - *size; 27 *origin = std::min(dst_origin + dst_size, *origin + *size) - *size;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 (x() == rect.right() || right() == rect.x())) || 247 (x() == rect.right() || right() == rect.x())) ||
248 (x() == rect.x() && width() == rect.width() && 248 (x() == rect.x() && width() == rect.width() &&
249 (y() == rect.bottom() || bottom() == rect.y())); 249 (y() == rect.bottom() || bottom() == rect.y()));
250 } 250 }
251 251
252 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) { 252 std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
253 return out << r.origin() << " " << r.size(); 253 return out << r.origin() << " " << r.size();
254 } 254 }
255 255
256 } // namespace gfx 256 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/rect.h ('k') | ui/gfx/rect_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698