| Index: content/browser/renderer_host/delegated_frame_host.cc
|
| diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
|
| index 3ea311ce025522466402e7eb7e7258f9aaf67485..adf66bc4789628be005c06fa823dcd80b06c57b1 100644
|
| --- a/content/browser/renderer_host/delegated_frame_host.cc
|
| +++ b/content/browser/renderer_host/delegated_frame_host.cc
|
| @@ -223,21 +223,26 @@ cc::SurfaceId DelegatedFrameHost::SurfaceIdAtPoint(
|
| return target_surface_id;
|
| }
|
|
|
| -void DelegatedFrameHost::TransformPointToLocalCoordSpace(
|
| +gfx::Point DelegatedFrameHost::TransformPointToLocalCoordSpace(
|
| const gfx::Point& point,
|
| - const cc::SurfaceId& original_surface,
|
| - gfx::Point* transformed_point) {
|
| - *transformed_point = point;
|
| + const cc::SurfaceId& original_surface) {
|
| if (surface_id_.is_null() || original_surface == surface_id_)
|
| - return;
|
| + return point;
|
|
|
| - gfx::Transform transform;
|
| + gfx::Point transformed_point = point;
|
| cc::SurfaceHittest hittest(nullptr, GetSurfaceManager());
|
| - if (hittest.GetTransformToTargetSurface(surface_id_, original_surface,
|
| - &transform) &&
|
| - transform.GetInverse(&transform)) {
|
| - transform.TransformPoint(transformed_point);
|
| - }
|
| + hittest.TransformPointToTargetSurface(original_surface, surface_id_,
|
| + &transformed_point);
|
| + return transformed_point;
|
| +}
|
| +
|
| +gfx::Point DelegatedFrameHost::TransformPointToCoordSpaceForView(
|
| + const gfx::Point& point,
|
| + RenderWidgetHostViewBase* target_view) {
|
| + if (surface_id_.is_null())
|
| + return point;
|
| +
|
| + return target_view->TransformPointToLocalCoordSpace(point, surface_id_);
|
| }
|
|
|
| bool DelegatedFrameHost::ShouldSkipFrame(gfx::Size size_in_dip) const {
|
|
|