Introduces ImageSkia::GetRepresentations() for Mac

chrome/browser/ui/views/wrench_menu.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 "chrome/browser/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 18 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
@@ skipping 340 matching lines @@
       size.set_height(height);
     return size;
   }
 
  private:
   int height_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonContainerMenuItemView);
 };
 
-gfx::ImageSkia* TintImage(gfx::ImageSkia* image, SkColor tint_value) {
-  // In case of touch, the menu needs to be brightened up a bit.
-  // Create a new bitmap since we do not want to change the original image.
-  SkBitmap bitmap_copy;
-  image->bitmap()->copyTo(&bitmap_copy, SkBitmap::kARGB_8888_Config);
-  SkCanvas canvas(bitmap_copy);
-  SkPaint paint;
-  // We leave the old alpha alone and add the new color multiplied
-  // with the source alpha to the existing alpha. Thus: We brighten
-  // the image up - but only the non transparent pixels.
-  paint.setXfermodeMode(SkXfermode::kDstATop_Mode);
-  paint.setColor(tint_value);
-  canvas.drawPaint(paint);
-  return new gfx::ImageSkia(bitmap_copy);
-}
+class TintedImageSource: public gfx::CanvasImageSource {
+ public:
+  TintedImageSource(gfx::ImageSkia& image, SkColor tint_value)
+      : CanvasImageSource(image.size(), false),
+        image_(image),
+        tint_value_(tint_value) {
+  }
+
+  virtual ~TintedImageSource() {
+  }
+
+  void Draw(gfx::Canvas* canvas) OVERRIDE {
+    canvas->DrawImageInt(image_, 0, 0);
+    SkPaint paint;
+    paint.setXfermodeMode(SkXfermode::kDstATop_Mode);
+    paint.setColor(tint_value_);
+    canvas->sk_canvas()->drawPaint(paint);
+  }
+
+ private:
+  const gfx::ImageSkia image_;
+  const SkColor tint_value_;
+};
 
 }  // namespace
 
 // CutCopyPasteView ------------------------------------------------------------
 
 // CutCopyPasteView is the view containing the cut/copy/paste buttons.
 class WrenchMenu::CutCopyPasteView : public WrenchMenuView {
  public:
   CutCopyPasteView(WrenchMenu* menu,
                    MenuModel* menu_model,
@@ skipping 108 matching lines @@
         IDS_ZOOM_PLUS2, MenuButtonBackground::RIGHT_BUTTON, increment_index,
         NULL, IDS_ACCNAME_ZOOM_PLUS2);
 
     center_bg->SetOtherButtons(decrement_button_, increment_button_);
 
     fullscreen_button_ = new FullscreenButton(this);
     gfx::ImageSkia* full_screen_image =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_FULLSCREEN_MENU_BUTTON);
     if (is_touch) {
-      tinted_fullscreen_image_.reset(TintImage(full_screen_image,
-                                               kTouchImageBrighten));
+      tinted_fullscreen_image_ = gfx::ImageSkia(new TintedImageSource(
+          *full_screen_image, kTouchImageBrighten), full_screen_image->size());
       fullscreen_button_->SetImage(ImageButton::BS_NORMAL,
-          tinted_fullscreen_image_.get());
+          new gfx::ImageSkia(tinted_fullscreen_image_));

[sadrul, 2012/07/17 03:30:08]

I think this is leaking ... you could just send &tinted_fullscreen_image_?

     } else {
       fullscreen_button_->SetImage(ImageButton::BS_NORMAL, full_screen_image);
     }
     if (is_touch) {
       zoom_label_->SetEnabledColor(kTouchButtonText);
       decrement_button_->SetEnabledColor(kTouchButtonText);
       increment_button_->SetEnabledColor(kTouchButtonText);
     } else {
       zoom_label_->SetEnabledColor(MenuConfig::instance().text_color);
     }
@@ skipping 146 matching lines @@
 
   // Label showing zoom as a percent.
   Label* zoom_label_;
 
   // Button for decrementing the zoom.
   TextButton* decrement_button_;
 
   ImageButton* fullscreen_button_;
 
   // The tinted bitmap of the fullscreen button.
-  scoped_ptr<gfx::ImageSkia> tinted_fullscreen_image_;
+  gfx::ImageSkia tinted_fullscreen_image_;
 
   // Width given to |zoom_label_|. This is the width at 100%.
   int zoom_label_width_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomView);
 };
 
 // WrenchMenu ------------------------------------------------------------------
 
 WrenchMenu::WrenchMenu(Browser* browser)
@@ skipping 361 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_,
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }