Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index 284533c8122b0257a8b835f96de284d305bb3a0b..7dd5317ead16654aa5e926e979e065e54829ab27 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -2040,18 +2040,27 @@ void RenderWidgetHostViewAura::ProcessGestureEvent( |
| host_->ForwardGestureEventWithLatencyInfo(event, latency); |
| } |
| -void RenderWidgetHostViewAura::TransformPointToLocalCoordSpace( |
| +gfx::Point RenderWidgetHostViewAura::TransformPointToLocalCoordSpace( |
| const gfx::Point& point, |
| - const cc::SurfaceId& original_surface, |
| - gfx::Point* transformed_point) { |
| + const cc::SurfaceId& original_surface) { |
| + gfx::Point transformed_point; |
| // Transformations use physical pixels rather than DIP, so conversion |
| // is necessary. |
| gfx::Point point_in_pixels = |
| gfx::ConvertPointToPixel(device_scale_factor_, point); |
| - delegated_frame_host_->TransformPointToLocalCoordSpace( |
| - point_in_pixels, original_surface, transformed_point); |
| - *transformed_point = |
| - gfx::ConvertPointToDIP(device_scale_factor_, *transformed_point); |
| + transformed_point = delegated_frame_host_->TransformPointToLocalCoordSpace( |
| + point_in_pixels, original_surface); |
| + return gfx::ConvertPointToDIP(device_scale_factor_, transformed_point); |
| +} |
| + |
| +gfx::Point RenderWidgetHostViewAura::TransformPointToCoordSpaceForView( |
| + const gfx::Point& point, |
| + RenderWidgetHostViewBase* target_view) { |
| + // In TransformPointToLocalCoordSpace() there is a Point-to-Pixel conversion, |
| + // but it is not necessary here because the final target view is responsible |
| + // for converting before computing the final transform. |
| + return delegated_frame_host_->TransformPointToCoordSpaceForView(point, |
| + target_view); |
|
lfg
2016/07/28 19:58:58
nit: indent.
|
| } |
| void RenderWidgetHostViewAura::FocusedNodeChanged(bool editable) { |