Implement hit tests/client area.

ui/views/mus/desktop_window_tree_host_mus.cc

 // Copyright 2016 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/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 15 matching lines @@
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura,
     const Widget::InitParams& init_params)
     : aura::WindowTreeHostMus(MusClient::Get()->window_tree_client(),
                               &init_params.mus_properties),
       native_widget_delegate_(native_widget_delegate),
       desktop_native_widget_aura_(desktop_native_widget_aura),
       fullscreen_restore_state_(ui::SHOW_STATE_DEFAULT),
       close_widget_factory_(this) {
   aura::Env::GetInstance()->AddObserver(this);
+  MusClient::Get()->AddObserver(this);
   // TODO: use display id and bounds if available, likely need to pass in
   // InitParams for that.
 }
 
 DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() {
+  MusClient::Get()->RemoveObserver(this);
   aura::Env::GetInstance()->RemoveObserver(this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
 bool DesktopWindowTreeHostMus::IsDocked() const {
   return window()->GetProperty(aura::client::kShowStateKey) ==
          ui::SHOW_STATE_DOCKED;
 }
 
+// TODO(erg): In addition to being called on system events, this also needs to
+// be called after window size changed.
+void DesktopWindowTreeHostMus::UpdateClientArea() {
+  NonClientView* non_client_view =
+      native_widget_delegate_->AsWidget()->non_client_view();
+  if (!non_client_view || !non_client_view->client_view())
+    return;
+
+  const gfx::Rect client_area_rect(non_client_view->client_view()->bounds());
+  SetClientArea(gfx::Insets(
+      client_area_rect.y(), client_area_rect.x(),
+      non_client_view->bounds().height() - client_area_rect.bottom(),
+      non_client_view->bounds().width() - client_area_rect.right()));
+}
+
+void DesktopWindowTreeHostMus::UpdateHitTestMask() {
+  if (!native_widget_delegate_->HasHitTestMask()) {
+    ClearHitTestMask();
+    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()));
+  SetHitTestMask(mask_rect);
+}
+
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {
   // TODO: handle device scale, http://crbug.com/663524.
   if (!params.bounds.IsEmpty())
     SetBounds(params.bounds);
 }
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
   if (params.parent && params.parent->GetHost()) {
@@ skipping 351 matching lines @@
 void DesktopWindowTreeHostMus::SizeConstraintsChanged() {
   Widget* widget = native_widget_delegate_->AsWidget();
   window()->SetProperty(aura::client::kCanMaximizeKey,
                         widget->widget_delegate()->CanMaximize());
   window()->SetProperty(aura::client::kCanMinimizeKey,
                         widget->widget_delegate()->CanMinimize());
   window()->SetProperty(aura::client::kCanResizeKey,
                         widget->widget_delegate()->CanResize());
 }
 
+void DesktopWindowTreeHostMus::OnWindowManagerFrameValuesChanged() {
+  NonClientView* non_client_view =
+      native_widget_delegate_->AsWidget()->non_client_view();
+  if (non_client_view) {
+    non_client_view->Layout();
+    non_client_view->SchedulePaint();
+  }
+
+  UpdateClientArea();
+  UpdateHitTestMask();
+}
+
 void DesktopWindowTreeHostMus::ShowImpl() {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(true);
   // Using ui::SHOW_STATE_NORMAL matches that of DesktopWindowTreeHostX11.
   ShowWindowWithState(ui::SHOW_STATE_NORMAL);
   WindowTreeHostMus::ShowImpl();
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(true);
 }
 
 void DesktopWindowTreeHostMus::HideImpl() {
   native_widget_delegate_->OnNativeWidgetVisibilityChanging(false);
@@ skipping 23 matching lines @@
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views