Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: components/mus/ws/window_finder.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/ws/server_window_surface_manager.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « components/mus/ws/server_window_surface_manager.cc ('k') | components/nacl/loader/nacl_helper_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698