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

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

Issue 23851026: add missing #includes of <algorithm>, needed on VS2013 for std::min/max (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/range/range.cc ('k') | ui/gfx/transform_util.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) 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/rect_conversions.h" 5 #include "ui/gfx/rect_conversions.h"
6 6
7 #include <algorithm>
7 #include <cmath> 8 #include <cmath>
8 9
9 #include "base/logging.h" 10 #include "base/logging.h"
10 #include "ui/gfx/safe_integer_conversions.h" 11 #include "ui/gfx/safe_integer_conversions.h"
11 12
12 namespace gfx { 13 namespace gfx {
13 14
14 Rect ToEnclosingRect(const RectF& rect) { 15 Rect ToEnclosingRect(const RectF& rect) {
15 int min_x = ToFlooredInt(rect.x()); 16 int min_x = ToFlooredInt(rect.x());
16 int min_y = ToFlooredInt(rect.y()); 17 int min_y = ToFlooredInt(rect.y());
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 73
73 Rect ToFlooredRectDeprecated(const RectF& rect) { 74 Rect ToFlooredRectDeprecated(const RectF& rect) {
74 return Rect(ToFlooredInt(rect.x()), 75 return Rect(ToFlooredInt(rect.x()),
75 ToFlooredInt(rect.y()), 76 ToFlooredInt(rect.y()),
76 ToFlooredInt(rect.width()), 77 ToFlooredInt(rect.width()),
77 ToFlooredInt(rect.height())); 78 ToFlooredInt(rect.height()));
78 } 79 }
79 80
80 } // namespace gfx 81 } // namespace gfx
81 82
OLDNEW
« no previous file with comments | « ui/gfx/range/range.cc ('k') | ui/gfx/transform_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698