Remove ImageSkia::empty and ImageSkia::extractSubset

chrome/browser/ui/views/web_intent_picker_views.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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time.h"
@@ skipping 21 matching lines @@
 #include "grit/shared_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ipc/ipc_message.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 160 matching lines @@
 const gfx::ImageSkia& ThrobberNativeTextButton::GetImageToPaint() const {
   if (!running_)
     return NativeTextButton::GetImageToPaint();
 
   const base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time_;
   const int current_frame =
       static_cast<int>(elapsed_time / frame_time_) % frame_count_;
   const int image_size = frames_->height();
   const int image_offset = current_frame * image_size;
 
-  SkIRect subset_rect = SkIRect::MakeXYWH(image_offset, 0,
-                                          image_size, image_size);
-  frames_->extractSubset(&this_frame_, subset_rect);
+  gfx::Rect subset_rect(image_offset, 0, image_size, image_size);
+  this_frame_ = gfx::ImageSkiaOperations::ExtractSubset(*frames_, subset_rect);
   return this_frame_;
 }
 
 void ThrobberNativeTextButton::Run() {
   DCHECK(running_);
 
   SchedulePaint();
 }
 
 // ServiceButtonsView ----------------------------------------------------------
@@ skipping 964 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X));
   close_button->SetImage(views::CustomButton::BS_HOT,
                           rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
   close_button->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetImageSkiaNamed(IDR_SHARED_IMAGES_X_HOVER));
   return close_button;
 }