cros/ash: If the partial magnifier is active, do not consume input events if over palette views.

ash/magnifier/partial_magnification_controller.cc

 // Copyright (c) 2012 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 "ash/magnifier/partial_magnification_controller.h"
 
+#include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "ash/shell.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
@@ skipping 178 matching lines @@
   // If that failed for any reason return.
   if (!host_widget_) {
     SetActive(false);
     return;
   }
 
   gfx::Point point = event->root_location();
 
   // Remap point from where it was captured to the display it is actually on.
   aura::Window* target = static_cast<aura::Window*>(event->target());
   aura::Window* event_root = target->GetRootWindow();

[James Cook, 2016/09/01 23:16:02]

I would compute point_in_screen here (using ui/wm/core/coordinate_conversion.h)
and pass the screen location into PaletteContainsEvent (and maybe rename that to
PaletteContainsPoint / PaletteContainsPointInScreen). It would simplify the
other function.

[jdufault, 2016/09/02 20:20:38]

Done.

   aura::Window::ConvertPointToTarget(
       event_root, host_widget_->GetNativeView()->GetRootWindow(), &point);
 
   host_widget_->SetBounds(GetBounds(point));
 
-  event->StopPropagation();
+  if (!PaletteContainsEvent(event))
+    event->StopPropagation();
 }
 
 void PartialMagnificationController::CreateMagnifierWindow(
     aura::Window* root_window) {
   if (host_widget_ || !root_window)
     return;
 
   root_window->AddObserver(this);
 
   gfx::Point mouse(
@@ skipping 45 matching lines @@
 
 void PartialMagnificationController::RemoveZoomWidgetObservers() {
   DCHECK(host_widget_);
   host_widget_->RemoveObserver(this);
   aura::Window* root_window = host_widget_->GetNativeView()->GetRootWindow();
   DCHECK(root_window);
   root_window->RemoveObserver(this);
 }
 
 }  // namespace ash