Remove override of View::HitTestRect() from ImageView

ui/views/controls/image_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.
 
 #include "ui/views/controls/image_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 187 matching lines @@
 
 bool ImageView::GetTooltipText(const gfx::Point& p,
                                base::string16* tooltip) const {
   if (tooltip_text_.empty())
     return false;
 
   *tooltip = GetTooltipText();
   return true;
 }
 
-bool ImageView::HitTestRect(const gfx::Rect& rect) const {
-  return interactive_ ? View::HitTestRect(rect) : false;
+bool ImageView::CanAcceptEvent(const ui::Event& event) {
+  return interactive_;

[sadrul, 2014/05/21 15:44:03]

Should this be 'interactive_ && View::CanAcceptEvent(event)'?

[tdanderson, 2014/05/21 21:07:49]

Done.

 }
 
-
 void ImageView::OnPaintImage(gfx::Canvas* canvas) {
   last_paint_scale_ = canvas->image_scale();
   last_painted_bitmap_pixels_ = NULL;
 
   if (image_.isNull())
     return;
 
   gfx::Rect image_bounds(GetImageBounds());
   if (image_bounds.IsEmpty())
     return;
 
   if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
     // Resize case
     SkPaint paint;
     paint.setFilterLevel(SkPaint::kLow_FilterLevel);
     canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
         image_bounds.x(), image_bounds.y(), image_bounds.width(),
         image_bounds.height(), true, paint);
   } else {
     canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
   }
   last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
 }
 
 }  // namespace views