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

Unified Diff: ui/views/controls/button/image_button.h

Issue 10704199: Implement remaining SkBitmapOperations as ImageSkiaOperations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/views/controls/button/image_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/image_button.h
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index 4ec203bf089f351789bee8f21f3996941c0004ac..215a9ac8c44c8ec33c458de99b154e8e9c014da9 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -64,9 +64,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
protected:
// Returns the image to paint. This is invoked from paint and returns a value
// from images.
- // |scale_factor| is the scale factor at which the view is painted and the
- // scale factor which should be used when mutating ImageSkias.
- virtual gfx::ImageSkia GetImageToPaint(ui::ScaleFactor scale_factor);
+ virtual gfx::ImageSkia GetImageToPaint();
// Updates button background for |scale_factor|.
void UpdateButtonBackground(ui::ScaleFactor scale_factor);
@@ -74,17 +72,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
// The images used to render the different states of this button.
gfx::ImageSkia images_[BS_COUNT];
- // Information necessary to generate background image.
- struct BackgroundImageGenerationInfo {
- BackgroundImageGenerationInfo();
- ~BackgroundImageGenerationInfo();
-
- SkColor src_color_;
- gfx::ImageSkia src_image_;
- gfx::ImageSkia src_mask_;
- gfx::ImageSkia result_;
- };
- BackgroundImageGenerationInfo background_image_;
+ gfx::ImageSkia background_image_;
// Image to draw on top of normal / hot / pushed image. Usually empty.
gfx::ImageSkia overlay_image_;
« no previous file with comments | « ui/gfx/image/image_skia_operations.cc ('k') | ui/views/controls/button/image_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698