mash: Preliminary support for widget hit test masks

components/mus/ws/window_finder.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/mus/ws/window_finder.h"
 
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_surface.h"
@@ skipping 21 matching lines @@
       continue;
 
     // TODO(sky): support transform.
     gfx::Point child_location(location->x() - child->bounds().x(),
                               location->y() - child->bounds().y());
     gfx::Rect child_bounds(child->bounds().size());
     child_bounds.Inset(-child->extended_hit_test_region().left(),
                        -child->extended_hit_test_region().top(),
                        -child->extended_hit_test_region().right(),
                        -child->extended_hit_test_region().bottom());
-    if (child_bounds.Contains(child_location)) {
-      *location = child_location;
-      ServerWindow* result = FindDeepestVisibleWindowForEvents(child, location);
-      if (IsValidWindowForEvents(result))
-        return result;
-    }
+    if (!child_bounds.Contains(child_location))
+      continue;
+
+    if (child->hit_test_mask() &&
+        !child->hit_test_mask()->Contains(child_location))
+      continue;
+
+    *location = child_location;
+    ServerWindow* result = FindDeepestVisibleWindowForEvents(child, location);
+    if (IsValidWindowForEvents(result))
+      return result;
   }
   return window;
 }
 
 gfx::Transform GetTransformToWindow(ServerWindow* window) {
   gfx::Transform transform;
   ServerWindow* current = window;
   while (current->parent()) {
     transform.Translate(-current->bounds().x(), -current->bounds().y());
     current = current->parent();
   }
   return transform;
 }
 
 }  // namespace ws
 }  // namespace mus