mash: Preliminary support for widget hit test masks

ui/views/mus/native_widget_mus.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 10 matching lines @@
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/path.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/mus/platform_window_mus.h"
 #include "ui/views/mus/surface_context_factory.h"
 #include "ui/views/mus/window_manager_constants_converters.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/custom_frame_view.h"
@@ skipping 445 matching lines @@
 // static
 void NativeWidgetMus::NotifyFrameChanged(
     mus::WindowTreeConnection* connection) {
   for (mus::Window* window : connection->GetRoots()) {
     NativeWidgetMus* native_widget =
         window->GetLocalProperty(kNativeWidgetMusKey);
     if (native_widget && native_widget->GetWidget()->non_client_view()) {
       native_widget->GetWidget()->non_client_view()->Layout();
       native_widget->GetWidget()->non_client_view()->SchedulePaint();
       native_widget->UpdateClientArea();
+      native_widget->UpdateHitTestMask();
     }
   }
 }
 
 // static
 Widget* NativeWidgetMus::GetWidgetForWindow(mus::Window* window) {
   if (!window)
     return nullptr;
   NativeWidgetMus* native_widget =
       window->GetLocalProperty(kNativeWidgetMusKey);
@@ skipping 161 matching lines @@
 
   native_widget_delegate_->OnNativeWidgetCreated(false);
 }
 
 void NativeWidgetMus::OnWidgetInitDone() {
   // The client area is calculated from the NonClientView. During
   // InitNativeWidget() the NonClientView has not been created. When this
   // function is called the NonClientView has been created, so that we can
   // correctly calculate the client area and push it to the mus::Window.
   UpdateClientArea();
+  UpdateHitTestMask();
 }
 
 bool NativeWidgetMus::ShouldUseNativeFrame() const {
   // NOTIMPLEMENTED();
   return false;
 }
 
 bool NativeWidgetMus::ShouldWindowContentsBeTransparent() const {
   // NOTIMPLEMENTED();
   return true;
@@ skipping 462 matching lines @@
   // Assume that if the old bounds was completely empty a move happened. This
   // handles the case of a maximize animation acquiring the layer (acquiring a
   // layer results in clearing the bounds).
   if (old_bounds.origin() != new_bounds.origin() ||
       (old_bounds == gfx::Rect(0, 0, 0, 0) && !new_bounds.IsEmpty())) {
     native_widget_delegate_->OnNativeWidgetMove();
   }
   if (old_bounds.size() != new_bounds.size()) {
     native_widget_delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
     UpdateClientArea();
+    UpdateHitTestMask();
   }
 }
 
 gfx::NativeCursor NativeWidgetMus::GetCursor(const gfx::Point& point) {
   return gfx::NativeCursor();
 }
 
 int NativeWidgetMus::GetNonClientComponent(const gfx::Point& point) const {
   return native_widget_delegate_->GetNonClientComponent(point);
 }
@@ skipping 125 matching lines @@
   if (window->visible()) {
     window_tree_host_->Show();
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
+void NativeWidgetMus::UpdateHitTestMask() {
+  if (!native_widget_delegate_->HasHitTestMask())

[sky, 2016/05/19 18:13:17]

This case should set the hit test mask to null.

[James Cook, 2016/05/19 21:47:46]

Done.

+    return;
+
+  gfx::Path mask_path;
+  native_widget_delegate_->GetHitTestMask(&mask_path);
+  // TODO(jamescook): Use the full path for the mask.
+  gfx::Rect mask_rect =
+      gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
+  window_->SetHitTestMask(mask_rect);
+}
+
 }  // namespace views