Remove hit test mask methods from views::View

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 936 matching lines @@
   return HitTestRect(gfx::Rect(point, gfx::Size(1, 1)));
 }
 
 bool View::HitTestRect(const gfx::Rect& rect) const {
   // If no ViewTargeter is installed on |this|, use the ViewTargeter installed
   // on our root view instead.
   ViewTargeter* view_targeter = targeter();
   if (!view_targeter)
     view_targeter = GetWidget()->GetRootView()->targeter();
   CHECK(view_targeter);
-
-  // TODO(tdanderson): The check for !HasHitTestMask() is temporary. Remove
-  //                   the check along with the duplicated code below once all
-  //                   of the masked views subclass MaskedViewDelegate.
-  //                   HasHitTestMask() and GetHitTestMaskDeprecated() can also
-  //                   be removed from the View interface at that time.
-  if (!HasHitTestMask())
-    return view_targeter->DoesIntersectRect(this, rect);
-
-  if (GetLocalBounds().Intersects(rect)) {
-    gfx::Path mask;
-    HitTestSource source = HIT_TEST_SOURCE_MOUSE;
-    if (!views::UsePointBasedTargeting(rect))
-      source = HIT_TEST_SOURCE_TOUCH;
-    GetHitTestMaskDeprecated(source, &mask);
-    SkRegion clip_region;
-    clip_region.setRect(0, 0, width(), height());
-    SkRegion mask_region;
-    return mask_region.setPath(mask, clip_region) &&
-           mask_region.intersects(RectToSkIRect(rect));
-  }
-  // Outside our bounds.
-  return false;
+  return view_targeter->DoesIntersectRect(this, rect);
 }
 
 bool View::IsMouseHovered() {
   // If we haven't yet been placed in an onscreen view hierarchy, we can't be
   // hovered.
   if (!GetWidget())
     return false;
 
   // If mouse events are disabled, then the mouse cursor is invisible and
   // is therefore not hovering over this button.
@@ skipping 595 matching lines @@
     // the front.
     for (Views::reverse_iterator it(children_.rbegin());
          it != children_.rend(); ++it) {
       (*it)->ReorderChildLayers(parent_layer);
     }
   }
 }
 
 // Input -----------------------------------------------------------------------
 
-bool View::HasHitTestMask() const {
-  return false;
-}
-
-void View::GetHitTestMaskDeprecated(HitTestSource source,
-                                    gfx::Path* mask) const {
-  DCHECK(mask);
-}
-
 View::DragInfo* View::GetDragInfo() {
   return parent_ ? parent_->GetDragInfo() : NULL;
 }
 
 // Focus -----------------------------------------------------------------------
 
 void View::OnFocus() {
   // TODO(beng): Investigate whether it's possible for us to move this to
   //             Focus().
   // By default, we clear the native focus. This ensures that no visible native
@@ skipping 892 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views