Change View::HitTest to View::HitTestRect

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.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 "chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 310 matching lines @@
   frame_painter_->LayoutHeader(this, UseShortHeader());
   if (avatar_button())
     LayoutAvatar();
   BrowserNonClientFrameView::Layout();
 }
 
 std::string BrowserNonClientFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
-bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Point& l) const {
+bool BrowserNonClientFrameViewAsh::HitTest(const gfx::Rect& r) const {
   // If the point is outside the bounds of the client area, claim it.
-  if (NonClientFrameView::HitTest(l))
+  if (NonClientFrameView::HitTest(r))
     return true;
 
   // Otherwise claim it only if it's in a non-tab portion of the tabstrip.
   if (!browser_view()->tabstrip())
     return false;
   gfx::Rect tabstrip_bounds(browser_view()->tabstrip()->bounds());
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   View::ConvertPointToView(frame()->client_view(), this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
-  if (l.y() > tabstrip_bounds.bottom())
+  if (r.y() > tabstrip_bounds.bottom())

[tdanderson, 2012/08/07 16:18:28]

Should this instead be r.y() + r.height() ?

[sky, 2012/08/07 20:11:43]

Yes, I believe it should be r.bottom().

[tdanderson, 2012/08/08 23:47:51]

Done.

     return false;
 
   // We convert from our parent's coordinates since we assume we fill its bounds
   // completely. We need to do this since we're not a parent of the tabstrip,
   // meaning ConvertPointToView would otherwise return something bogus.
-  gfx::Point browser_view_point(l);
+  gfx::Point browser_view_point(gfx::Point(r.x(), r.y()));

[sky, 2012/08/07 20:11:43]

I don't think this is right here, it only tests the origin.
IsPositionInWindowCaption likely needs to be updated too.

[tdanderson, 2012/08/08 23:47:51]

I passed in the center point since TabStrip::IsPositionInWindowCaption uses
View::GetEventHandlerForPoint, which means that there is no reason to pass a
rect since we do not have a GetEventHandlerForRect or a general GetEventHandler
implemented.

[sky, 2012/08/09 00:30:14]

Can you add a TODO then so that you don't miss updating it when we get
GetEventHandlerForRect? Alternatively add it know, but had it call with the
center so that you can get this working. I'm fine with either approach for now.

[tdanderson, 2012/08/09 16:16:46]

I have added a TODO(tdanderson) for now and will update this when I resume work
on views fuzzing.

   View::ConvertPointToView(parent(), browser_view(), &browser_view_point);
   return browser_view()->IsPositionInWindowCaption(browser_view_point);
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
 }
 
 gfx::Size BrowserNonClientFrameViewAsh::GetMinimumSize() {
@@ skipping 239 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }