| 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/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" | |
| 13 #include "ui/gfx/geometry/dip_util.h" | 12 #include "ui/gfx/geometry/dip_util.h" |
| 14 #include "ui/gfx/geometry/point.h" | 13 #include "ui/gfx/geometry/point.h" |
| 15 #include "ui/gfx/geometry/point_conversions.h" | 14 #include "ui/gfx/geometry/point_conversions.h" |
| 16 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 17 #include "ui/gfx/geometry/rect_conversions.h" | 16 #include "ui/gfx/geometry/rect_conversions.h" |
| 18 #include "ui/gfx/geometry/size.h" | 17 #include "ui/gfx/geometry/size.h" |
| 19 #include "ui/gfx/geometry/size_conversions.h" | 18 #include "ui/gfx/geometry/size_conversions.h" |
| 20 | 19 |
| 21 #if DCHECK_IS_ON() | 20 #if DCHECK_IS_ON() |
| 22 #include "ui/compositor/layer_animator.h" | 21 #include "ui/compositor/layer_animator.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 layer_to_snap->subpixel_position_offset(); | 103 layer_to_snap->subpixel_position_offset(); |
| 105 } else { | 104 } else { |
| 106 origin = layer_to_snap->position(); | 105 origin = layer_to_snap->position(); |
| 107 } | 106 } |
| 108 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor); | 107 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor); |
| 109 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor); | 108 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor); |
| 110 #endif | 109 #endif |
| 111 } | 110 } |
| 112 | 111 |
| 113 } // namespace ui | 112 } // namespace ui |
| OLD | NEW |