Clean up 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 <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/paint_flags.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/views/painter.h"
 
 namespace views {
 
 namespace {
 
 // Returns the pixels for the bitmap in |image| at scale |image_scale|.
 void* GetBitmapPixels(const gfx::ImageSkia& img, float image_scale) {
   DCHECK_NE(0.0f, image_scale);
   const SkBitmap& bitmap = img.GetRepresentation(image_scale).sk_bitmap();
   SkAutoLockPixels pixel_lock(bitmap);
   return bitmap.getPixels();
 }
 
 }  // namespace
 
 // static
 const char ImageView::kViewClassName[] = "ImageView";
 
 ImageView::ImageView()
     : image_size_set_(false),
       horiz_alignment_(CENTER),
       vert_alignment_(CENTER),
-      interactive_(true),
       last_paint_scale_(0.f),
-      last_painted_bitmap_pixels_(NULL),
-      focus_painter_(Painter::CreateDashedFocusPainter()) {
-}
+      last_painted_bitmap_pixels_(NULL) {}
 
-ImageView::~ImageView() {
-}
+ImageView::~ImageView() {}
 
 void ImageView::SetImage(const gfx::ImageSkia& img) {
   if (IsImageEqual(img))
     return;
 
   last_painted_bitmap_pixels_ = NULL;
   gfx::Size pref_size(GetPreferredSize());
   image_ = img;
   if (pref_size != GetPreferredSize())
     PreferredSizeChanged();
@@ skipping 21 matching lines @@
 
 gfx::Rect ImageView::GetImageBounds() const {
   gfx::Size image_size = GetImageSize();
   return gfx::Rect(ComputeImageOrigin(image_size), image_size);
 }
 
 void ImageView::ResetImageSize() {
   image_size_set_ = false;
 }
 
-void ImageView::SetFocusPainter(std::unique_ptr<Painter> focus_painter) {
-  focus_painter_ = std::move(focus_painter);
-}
-
 gfx::Size ImageView::GetPreferredSize() const {
   gfx::Size size = GetImageSize();
   size.Enlarge(GetInsets().width(), GetInsets().height());
   return size;
 }
 
 bool ImageView::IsImageEqual(const gfx::ImageSkia& img) const {
   // Even though we copy ImageSkia in SetImage() the backing store
   // (ImageSkiaStorage) is not copied and may have changed since the last call
   // to SetImage(). The expectation is that SetImage() with different pixels is
@@ skipping 30 matching lines @@
   switch (vert_alignment_) {
     case LEADING:  y = insets.top();                                     break;
     case TRAILING: y = height() - insets.bottom() - image_size.height(); break;
     case CENTER:   y = (height() - image_size.height()) / 2;             break;
     default:       NOTREACHED(); y = 0;                                  break;
   }
 
   return gfx::Point(x, y);
 }
 
-void ImageView::OnFocus() {
-  View::OnFocus();
-  if (focus_painter_.get())
-    SchedulePaint();
-}
-
-void ImageView::OnBlur() {
-  View::OnBlur();
-  if (focus_painter_.get())
-    SchedulePaint();
-}
-
 void ImageView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
   OnPaintImage(canvas);
-  Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 void ImageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_IMAGE;
   node_data->SetName(tooltip_text_);
 }
 
 const char* ImageView::GetClassName() const {
   return kViewClassName;
 }
@@ skipping 30 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::CanProcessEventsWithinSubtree() const {
-  return interactive_;
-}
-
 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
     cc::PaintFlags flags;
     flags.setFilterQuality(kLow_SkFilterQuality);
     canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
                          image_bounds.x(), image_bounds.y(),
                          image_bounds.width(), image_bounds.height(), true,
                          flags);
   } else {
     canvas->DrawImageInt(image_, image_bounds.x(), image_bounds.y());
   }
   last_painted_bitmap_pixels_ = GetBitmapPixels(image_, last_paint_scale_);
 }
 
 }  // namespace views