Only consider overlay window controls for hittest if they are visible.

Bug: 883159
Test: PIP window no longer has draggabilty issues for touch input
Change-Id: I70121fd76bcc32e932ed49c4250301b0a2f884e9
Reviewed-on: https://chromium-review.googlesource.com/c/1341743
Commit-Queue: Eliot Courtney <edcourtney@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609596}

chrome/browser/ui/views/overlay/overlay_window_views.cc

@@ -110,17 +110,19 @@ class OverlayWindowFrameView : public views::NonClientFrameView {
 
     // The media controls should take and handle user interaction.
     OverlayWindowViews* window = static_cast<OverlayWindowViews*>(widget_);
-    if (window->GetCloseControlsBounds().Contains(point) ||
-        window->GetFirstCustomControlsBounds().Contains(point) ||
-        window->GetSecondCustomControlsBounds().Contains(point) ||
-        window->GetPlayPauseControlsBounds().Contains(point)) {
+    if (window->AreControlsVisible() &&
+        (window->GetCloseControlsBounds().Contains(point) ||
+         window->GetFirstCustomControlsBounds().Contains(point) ||
+         window->GetSecondCustomControlsBounds().Contains(point) ||
+         window->GetPlayPauseControlsBounds().Contains(point))) {
       return window_component;
     }
 
 #if defined(OS_CHROMEOS)
     // If the resize handle is clicked on, we want to force the hit test to
     // force a resize drag.
-    if (window->GetResizeHandleControlsBounds().Contains(point))
+    if (window->AreControlsVisible() &&
+        window->GetResizeHandleControlsBounds().Contains(point))
       return window->GetResizeHTComponent();
 #endif
 
@@ -782,7 +784,7 @@ void OverlayWindowViews::OnGestureEvent(ui::GestureEvent* event) {
   // layers are expected to have the same visibility.
   // TODO(apacible): This placeholder logic should be updated with touchscreen
   // specific investigation. https://crbug/854373
-  if (!GetControlsScrimLayer()->visible()) {
+  if (!AreControlsVisible()) {
     UpdateControlsVisibility(true);
     return;
   }
@@ -841,6 +843,10 @@ int OverlayWindowViews::GetResizeHTComponent() const {
   return resize_handle_view_->GetHTComponent();
 }
 
+bool OverlayWindowViews::AreControlsVisible() const {
+  return controls_scrim_view_->layer()->visible();
+}
+
 ui::Layer* OverlayWindowViews::GetControlsScrimLayer() {
   return controls_scrim_view_->layer();
 }

chrome/browser/ui/views/overlay/overlay_window_views.h

@@ -74,6 +74,10 @@ class OverlayWindowViews : public content::OverlayWindow,
   // handle in order to force a drag-to-resize.
   int GetResizeHTComponent() const;
 
+  // Returns true if the controls (e.g. close button, play/pause button) are
+  // visible.
+  bool AreControlsVisible() const;
+
   views::ToggleImageButton* play_pause_controls_view_for_testing() const;
   gfx::Point close_image_position_for_testing() const;
   gfx::Point resize_handle_position_for_testing() const;