Make browser hit testing return correct SurfaceId with nested Surfaces

cc/surfaces/surface_hittest.cc

Index: cc/surfaces/surface_hittest.cc
diff --git a/cc/surfaces/surface_hittest.cc b/cc/surfaces/surface_hittest.cc
index 6db66e244142ef081f08630dcc7f35ec7df56642..b9be19e3e827a03e5bd02b34f08e886f89824ecf 100644
--- a/cc/surfaces/surface_hittest.cc
+++ b/cc/surfaces/surface_hittest.cc
@@ -104,9 +104,13 @@ bool SurfaceHittest::GetTargetSurfaceAtPointInternal(
       gfx::Transform transform_to_child_space;
       if (GetTargetSurfaceAtPointInternal(
               surface_quad->surface_id, RenderPassId(), point_in_quad_space,
-              referenced_passes, out_surface_id, &transform_to_child_space) ||
-          (delegate_ &&
-           delegate_->AcceptHitTarget(surface_quad, point_in_quad_space))) {
+              referenced_passes, out_surface_id, &transform_to_child_space)) {
+        *out_transform = transform_to_child_space * target_to_quad_transform *
+                         transform_from_root_target;
+        return true;
+      } else if (delegate_ &&
+                 delegate_->AcceptHitTarget(surface_quad,
+                                            point_in_quad_space)) {
         *out_surface_id = surface_quad->surface_id;
         *out_transform = transform_to_child_space * target_to_quad_transform *
                          transform_from_root_target;