chromeos: Laser tool blocks events from propagating.

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"
 
-#if defined(OS_CHROMEOS)
-#include "ash/common/system/chromeos/palette/palette_utils.h"
-#endif
-
 namespace ash {
 namespace {
 
 // Ratio of magnifier scale.
 const float kMagnificationScale = 2.f;
 // Radius of the magnifying glass in DIP.
 const int kMagnifierRadius = 200;
 // Size of the border around the magnifying glass in DIP.
 const int kBorderSize = 10;
 // Thickness of the outline around magnifying glass border in DIP.
@@ skipping 26 matching lines @@
 aura::Window* GetCurrentRootWindow() {
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
   for (aura::Window* root_window : root_windows) {
     if (root_window->ContainsPointInRoot(
             root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot()))
       return root_window;
   }
   return nullptr;
 }
 
-// Returns true if the event should be processed normally, ie, the stylus is
-// over the palette icon or widget.
-bool ShouldSkipEventFiltering(const gfx::Point& point) {
-#if defined(OS_CHROMEOS)
-  return PaletteContainsPointInScreen(point);
-#else
-  return false;
-#endif
-}
-
 }  // namespace
 
 // The content mask provides a clipping layer for the magnification window so we
 // can show a circular magnifier.
 class PartialMagnificationController::ContentMask : public ui::LayerDelegate {
  public:
   // If |stroke| is true, the circle will be a stroke. This is useful if we wish
   // to clip a border.
   ContentMask(bool stroke, gfx::Size mask_bounds)
       : layer_(ui::LAYER_TEXTURED), stroke_(stroke) {
@@ skipping 160 matching lines @@
 
   if (pointer_details.pointer_type != ui::EventPointerType::POINTER_TYPE_PEN)
     return;
 
   // Compute the event location in screen space.
   aura::Window* target = static_cast<aura::Window*>(event->target());
   aura::Window* event_root = target->GetRootWindow();
   gfx::Point screen_point = event->root_location();
   wm::ConvertPointToScreen(event_root, &screen_point);
 
+  // If the stylus is pressed on the palette icon or widget, do not activate.
   if (event->type() == ui::ET_MOUSE_PRESSED &&
-      !ShouldSkipEventFiltering(screen_point)) {
+      !PaletteContainsPointInScreen(screen_point)) {
     SetActive(true);
   }
 
   if (event->type() == ui::ET_MOUSE_RELEASED)
     SetActive(false);
 
   if (!is_active_)
     return;
 
   // If the previous root window was detached host_widget_ will be null;
   // reconstruct it. We also need to change the root window if the cursor has
   // crossed display boundries.
   SwitchTargetRootWindowIfNeeded(GetCurrentRootWindow());
 
   // If that failed for any reason return.
   if (!host_widget_) {
     SetActive(false);
     return;
   }
 
   // Remap point from where it was captured to the display it is actually on.
   gfx::Point point = event->root_location();
   aura::Window::ConvertPointToTarget(
       event_root, host_widget_->GetNativeView()->GetRootWindow(), &point);
   host_widget_->SetBounds(GetBounds(point));
 
-  if (!ShouldSkipEventFiltering(screen_point))
+  // If the stylus is over the palette icon or widget, do not consume the event.
+  if (!PaletteContainsPointInScreen(screen_point))
     event->StopPropagation();
 }
 
 void PartialMagnificationController::CreateMagnifierWindow(
     aura::Window* root_window) {
   if (host_widget_ || !root_window)
     return;
 
   root_window->AddObserver(this);
 
@@ skipping 47 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