Implement remaining SkBitmapOperations as ImageSkiaOperations

ui/views/controls/button/image_button.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/button/image_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/screen.h"
-#include "ui/gfx/skbitmap_operations.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 static const int kDefaultWidth = 16;   // Default button width if no theme.
 static const int kDefaultHeight = 14;  // Default button height if no theme.
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, public:
 
@@ skipping 12 matching lines @@
 }
 
 void ImageButton::SetImage(ButtonState state, const gfx::ImageSkia* image) {
   images_[state] = image ? *image : gfx::ImageSkia();
   PreferredSizeChanged();
 }
 
 void ImageButton::SetBackground(SkColor color,
                                 const gfx::ImageSkia* image,
                                 const gfx::ImageSkia* mask) {
-  background_image_.src_color_ = color;
-  background_image_.src_image_ = image ? *image : gfx::ImageSkia();
-  background_image_.src_mask_ = mask ? *mask : gfx::ImageSkia();
-  background_image_.result_ = gfx::ImageSkia();
+  if (image == NULL || mask == NULL)
+    return;
+
+  background_image_ = gfx::ImageSkiaOperations::CreateButtonBackground(color,
+     *image, *mask);
 }
 
 void ImageButton::SetOverlayImage(const gfx::ImageSkia* image) {
   if (!image) {
     overlay_image_ = gfx::ImageSkia();
     return;
   }
   overlay_image_ = *image;
 }
 
@@ skipping 10 matching lines @@
 gfx::Size ImageButton::GetPreferredSize() {
   if (!images_[BS_NORMAL].isNull())
     return gfx::Size(images_[BS_NORMAL].width(), images_[BS_NORMAL].height());
   return preferred_size_;
 }
 
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
   // Call the base class first to paint any background/borders.
   View::OnPaint(canvas);
 
-  ui::ScaleFactor current_device_scale_factor = canvas->scale_factor();
-  gfx::ImageSkia img = GetImageToPaint(current_device_scale_factor);
+  gfx::ImageSkia img = GetImageToPaint();
 
   if (!img.isNull()) {
     int x = 0, y = 0;
 
     if (h_alignment_ == ALIGN_CENTER)
       x = (width() - img.width()) / 2;
     else if (h_alignment_ == ALIGN_RIGHT)
       x = width() - img.width();
 
     if (v_alignment_ == ALIGN_MIDDLE)
       y = (height() - img.height()) / 2;
     else if (v_alignment_ == ALIGN_BOTTOM)
       y = height() - img.height();
 
-    if (!background_image_.result_.HasRepresentation(
-        current_device_scale_factor)) {
-      UpdateButtonBackground(current_device_scale_factor);
-    }
-    if (!background_image_.result_.empty())
-      canvas->DrawImageInt(background_image_.result_, x, y);
+    if (!background_image_.isNull())
+      canvas->DrawImageInt(background_image_, x, y);
 
     canvas->DrawImageInt(img, x, y);
 
     if (!overlay_image_.empty())
       canvas->DrawImageInt(overlay_image_, x, y);
   }
   OnPaintFocusBorder(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, protected:
 
-gfx::ImageSkia ImageButton::GetImageToPaint(ui::ScaleFactor scale_factor) {
+gfx::ImageSkia ImageButton::GetImageToPaint() {
   gfx::ImageSkia img;
 
   if (!images_[BS_HOT].isNull() && hover_animation_->is_animating()) {
-    gfx::ImageSkiaRep normal_image_rep = images_[BS_NORMAL].GetRepresentation(
-        scale_factor);
-    gfx::ImageSkiaRep hot_image_rep = images_[BS_HOT].GetRepresentation(
-        scale_factor);
-    DCHECK_EQ(normal_image_rep.scale_factor(), hot_image_rep.scale_factor());
-    SkBitmap blended_bitmap = SkBitmapOperations::CreateBlendedBitmap(
-        normal_image_rep.sk_bitmap(),
-        hot_image_rep.sk_bitmap(),
-        hover_animation_->GetCurrentValue());
-    img = gfx::ImageSkia(gfx::ImageSkiaRep(blended_bitmap,
-                                           normal_image_rep.scale_factor()));
+    img = gfx::ImageSkiaOperations::CreateBlendedImage(images_[BS_NORMAL],
+        images_[BS_HOT], hover_animation_->GetCurrentValue());
   } else {
     img = images_[state_];
   }
 
   return !img.isNull() ? img : images_[BS_NORMAL];
 }
 
-void ImageButton::UpdateButtonBackground(ui::ScaleFactor scale_factor) {
-  gfx::ImageSkiaRep image_rep =
-      background_image_.src_image_.GetRepresentation(scale_factor);
-  gfx::ImageSkiaRep mask_image_rep =
-      background_image_.src_mask_.GetRepresentation(scale_factor);
-  if (image_rep.is_null() || mask_image_rep.is_null() ||
-      background_image_.result_.HasRepresentation(image_rep.scale_factor())) {
-    return;
-  }
-  DCHECK_EQ(image_rep.scale_factor(), mask_image_rep.scale_factor());
-  SkBitmap result = SkBitmapOperations::CreateButtonBackground(
-      background_image_.src_color_,
-      image_rep.sk_bitmap(),
-      mask_image_rep.sk_bitmap());
-  background_image_.result_.AddRepresentation(gfx::ImageSkiaRep(
-      result, image_rep.scale_factor()));
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, public:
 
 ToggleImageButton::ToggleImageButton(ButtonListener* listener)
     : ImageButton(listener),
       toggled_(false) {
 }
 
 ToggleImageButton::~ToggleImageButton() {
 }
@@ skipping 46 matching lines @@
 
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        string16* tooltip) const {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// struct BackgroundImageGenerationInfo
-ImageButton::BackgroundImageGenerationInfo::BackgroundImageGenerationInfo()
-    : src_color_(0) {
-}
-
-ImageButton::BackgroundImageGenerationInfo::~BackgroundImageGenerationInfo() {
-}
-
 }  // namespace views