Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Unified Diff: chrome/browser/ui/views/web_intent_picker_views.cc

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/web_intent_picker_views.cc
diff --git a/chrome/browser/ui/views/web_intent_picker_views.cc b/chrome/browser/ui/views/web_intent_picker_views.cc
index 2296ae08ac5a8eed294453a4156f944aec877868..85c305c8384f28c4718d23df9edd0f763feccb2e 100644
--- a/chrome/browser/ui/views/web_intent_picker_views.cc
+++ b/chrome/browser/ui/views/web_intent_picker_views.cc
@@ -39,6 +39,7 @@
#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"
@@ -219,9 +220,8 @@ const gfx::ImageSkia& ThrobberNativeTextButton::GetImageToPaint() const {
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_;
}
« no previous file with comments | « chrome/browser/ui/views/ash/balloon_view_ash.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_dropdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698