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

Side by Side Diff: ui/compositor/dip_util.cc

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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
« no previous file with comments | « ui/chromeos/network/network_icon.cc ('k') | ui/compositor/layer.h » ('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/compositor/dip_util.h" 5 #include "ui/compositor/dip_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
10 #include "ui/compositor/compositor_switches.h" 10 #include "ui/compositor/compositor_switches.h"
11 #include "ui/compositor/layer.h" 11 #include "ui/compositor/layer.h"
12 #include "ui/gfx/display.h" 12 #include "ui/gfx/display.h"
13 #include "ui/gfx/geometry/dip_util.h" 13 #include "ui/gfx/geometry/dip_util.h"
14 #include "ui/gfx/geometry/point.h" 14 #include "ui/gfx/geometry/point.h"
15 #include "ui/gfx/geometry/point_conversions.h" 15 #include "ui/gfx/geometry/point_conversions.h"
16 #include "ui/gfx/rect.h" 16 #include "ui/gfx/geometry/rect.h"
17 #include "ui/gfx/rect_conversions.h" 17 #include "ui/gfx/geometry/rect_conversions.h"
18 #include "ui/gfx/size.h" 18 #include "ui/gfx/size.h"
19 #include "ui/gfx/size_conversions.h" 19 #include "ui/gfx/size_conversions.h"
20 20
21 #if DCHECK_IS_ON 21 #if DCHECK_IS_ON
22 #include "ui/compositor/layer_animator.h" 22 #include "ui/compositor/layer_animator.h"
23 #endif 23 #endif
24 24
25 namespace ui { 25 namespace ui {
26 26
27 float GetDeviceScaleFactor(const Layer* layer) { 27 float GetDeviceScaleFactor(const Layer* layer) {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } else { 105 } else {
106 cc::Layer* cc_layer = layer_to_snap->cc_layer(); 106 cc::Layer* cc_layer = layer_to_snap->cc_layer();
107 origin = cc_layer->position(); 107 origin = cc_layer->position();
108 } 108 }
109 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor); 109 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor);
110 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor); 110 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor);
111 #endif 111 #endif
112 } 112 }
113 113
114 } // namespace ui 114 } // namespace ui
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon.cc ('k') | ui/compositor/layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698