| Index: components/mus/ws/window_finder.cc
|
| diff --git a/components/mus/ws/window_finder.cc b/components/mus/ws/window_finder.cc
|
| index 592d7538d330c71705ce4306769ecc00f7abd544..76de747f6eb2f692e54dd514c62ba01450186c78 100644
|
| --- a/components/mus/ws/window_finder.cc
|
| +++ b/components/mus/ws/window_finder.cc
|
| @@ -84,7 +84,7 @@ ServerWindow* FindDeepestVisibleWindowForEvents(
|
| cc::SurfaceId display_surface_id,
|
| gfx::Point* location) {
|
| // TODO(sky): remove this when insets can be set on surface.
|
| - display_surface_id = cc::SurfaceId();
|
| + // display_surface_id = cc::SurfaceId();
|
|
|
| if (display_surface_id.is_null()) {
|
| // Surface-based hit-testing will not return a valid target if no
|
| @@ -106,7 +106,8 @@ ServerWindow* FindDeepestVisibleWindowForEvents(
|
| ServerWindow* target = root_window->GetChildWindow(id);
|
| if (target)
|
| transform.TransformPoint(location);
|
| - return target;
|
| + return target ? target
|
| + : FindDeepestVisibleWindowNonSurface(root_window, location);
|
| }
|
|
|
| gfx::Transform GetTransformToWindow(cc::SurfaceId display_surface_id,
|
|
|