| 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" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 77 |
| 78 void SnapLayerToPhysicalPixelBoundary(ui::Layer* snapped_layer, | 78 void SnapLayerToPhysicalPixelBoundary(ui::Layer* snapped_layer, |
| 79 ui::Layer* layer_to_snap) { | 79 ui::Layer* layer_to_snap) { |
| 80 DCHECK_NE(snapped_layer, layer_to_snap); | 80 DCHECK_NE(snapped_layer, layer_to_snap); |
| 81 DCHECK(snapped_layer); | 81 DCHECK(snapped_layer); |
| 82 DCHECK(snapped_layer->Contains(layer_to_snap)); | 82 DCHECK(snapped_layer->Contains(layer_to_snap)); |
| 83 | 83 |
| 84 gfx::Point view_offset_dips = layer_to_snap->GetTargetBounds().origin(); | 84 gfx::Point view_offset_dips = layer_to_snap->GetTargetBounds().origin(); |
| 85 ui::Layer::ConvertPointToLayer( | 85 ui::Layer::ConvertPointToLayer( |
| 86 layer_to_snap->parent(), snapped_layer, &view_offset_dips); | 86 layer_to_snap->parent(), snapped_layer, &view_offset_dips); |
| 87 gfx::PointF view_offset = view_offset_dips; | 87 auto view_offset = gfx::PointF(view_offset_dips); |
| 88 | 88 |
| 89 float scale_factor = GetDeviceScaleFactor(layer_to_snap); | 89 float scale_factor = GetDeviceScaleFactor(layer_to_snap); |
| 90 view_offset.Scale(scale_factor); | 90 view_offset.Scale(scale_factor); |
| 91 gfx::PointF view_offset_snapped(gfx::ToRoundedInt(view_offset.x()), | 91 gfx::PointF view_offset_snapped(gfx::ToRoundedInt(view_offset.x()), |
| 92 gfx::ToRoundedInt(view_offset.y())); | 92 gfx::ToRoundedInt(view_offset.y())); |
| 93 | 93 |
| 94 gfx::Vector2dF fudge = view_offset_snapped - view_offset; | 94 gfx::Vector2dF fudge = view_offset_snapped - view_offset; |
| 95 fudge.Scale(1.0 / scale_factor); | 95 fudge.Scale(1.0 / scale_factor); |
| 96 layer_to_snap->SetSubpixelPositionOffset(fudge); | 96 layer_to_snap->SetSubpixelPositionOffset(fudge); |
| 97 #if DCHECK_IS_ON() | 97 #if DCHECK_IS_ON() |
| 98 gfx::Point layer_offset; | 98 gfx::Point layer_offset; |
| 99 gfx::PointF origin; | 99 gfx::PointF origin; |
| 100 Layer::ConvertPointToLayer( | 100 Layer::ConvertPointToLayer( |
| 101 layer_to_snap->parent(), snapped_layer, &layer_offset); | 101 layer_to_snap->parent(), snapped_layer, &layer_offset); |
| 102 if (layer_to_snap->GetAnimator()->is_animating()) { | 102 if (layer_to_snap->GetAnimator()->is_animating()) { |
| 103 origin = layer_to_snap->GetTargetBounds().origin() + | 103 origin = gfx::PointF(layer_to_snap->GetTargetBounds().origin()) + |
| 104 layer_to_snap->subpixel_position_offset(); | 104 layer_to_snap->subpixel_position_offset(); |
| 105 } else { | 105 } else { |
| 106 origin = layer_to_snap->position(); | 106 origin = layer_to_snap->position(); |
| 107 } | 107 } |
| 108 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor); | 108 CheckSnapped((layer_offset.x() + origin.x()) * scale_factor); |
| 109 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor); | 109 CheckSnapped((layer_offset.y() + origin.y()) * scale_factor); |
| 110 #endif | 110 #endif |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace ui | 113 } // namespace ui |
| OLD | NEW |