Remove support for background masks. These are no longer necessary in the ne...

chrome/browser/gtk/custom_button.cc

 // Copyright (c) 2010 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/gtk/custom_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider,
                                            int normal_id,
                                            int pressed_id,
                                            int hover_id,
-                                           int disabled_id,
-                                           int background_id)
+                                           int disabled_id)
     : background_image_(NULL),
       paint_override_(-1),
       normal_id_(normal_id),
       pressed_id_(pressed_id),
       hover_id_(hover_id),
       disabled_id_(disabled_id),
-      button_background_id_(background_id),
       theme_provider_(theme_provider),
       flipped_(false) {
   for (int i = 0; i < (GTK_STATE_INSENSITIVE + 1); ++i)
     surfaces_[i].reset(new CairoCachedSurface);
   background_image_.reset(new CairoCachedSurface);
 
   if (theme_provider) {
     // Load images by pretending that we got a BROWSER_THEME_CHANGED
     // notification.
     theme_provider->InitThemesFor(this);
@@ skipping 103 matching lines @@
 
   surfaces_[GTK_STATE_NORMAL]->UsePixbuf(normal_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(normal_id_) : NULL);
   surfaces_[GTK_STATE_ACTIVE]->UsePixbuf(pressed_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(pressed_id_) : NULL);
   surfaces_[GTK_STATE_PRELIGHT]->UsePixbuf(hover_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(hover_id_) : NULL);
   surfaces_[GTK_STATE_SELECTED]->UsePixbuf(NULL);
   surfaces_[GTK_STATE_INSENSITIVE]->UsePixbuf(disabled_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(disabled_id_) : NULL);
-
-  // Use the tinted background in some themes.
-  if (button_background_id_) {
-    SkColor color = theme_provider_->GetColor(
-        BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
-    SkBitmap* background = theme_provider_->GetBitmapNamed(
-        IDR_THEME_BUTTON_BACKGROUND);
-    SkBitmap* mask = theme_provider_->GetBitmapNamed(button_background_id_);
-
-    SetBackground(color, background, mask);
-  }
 }
 
 CairoCachedSurface* CustomDrawButtonBase::PixbufForState(int state) {
   CairoCachedSurface* pixbuf = surfaces_[state].get();
 
   // Fall back to the default image if we don't have one for this state.
   if (!pixbuf || !pixbuf->valid())
     pixbuf = surfaces_[GTK_STATE_NORMAL].get();
 
   return pixbuf;
@@ skipping 50 matching lines @@
     controller->slide_animation_.Hide();
   return FALSE;
 }
 
 // CustomDrawButton ------------------------------------------------------------
 
 CustomDrawButton::CustomDrawButton(int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id)
-    : button_base_(NULL, normal_id, pressed_id, hover_id, disabled_id, 0),
+    : button_base_(NULL, normal_id, pressed_id, hover_id, disabled_id),
       theme_provider_(NULL),
       gtk_stock_name_(NULL),
       icon_size_(GTK_ICON_SIZE_INVALID) {
   Init();
 
   // Initialize the theme stuff with no theme_provider.
   SetBrowserTheme();
 }
 
 CustomDrawButton::CustomDrawButton(GtkThemeProvider* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
-                                   int background_id,
                                    const char* stock_id,
                                    GtkIconSize stock_size)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
-                   disabled_id, background_id),
+                   disabled_id),
       theme_provider_(theme_provider),
       gtk_stock_name_(stock_id),
       icon_size_(stock_size) {
   Init();
 
   theme_provider_->InitThemesFor(this);
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
@@ skipping 42 matching lines @@
     return FALSE;
   } else {
     double hover_state = button->hover_controller_.GetCurrentValue();
     return button->button_base_.OnExpose(widget, e, hover_state);
   }
 }
 
 // static
 CustomDrawButton* CustomDrawButton::CloseButton(
     GtkThemeProvider* theme_provider) {
-  CustomDrawButton* button = new CustomDrawButton(
-      theme_provider, IDR_CLOSE_BAR, IDR_CLOSE_BAR_P,
-      IDR_CLOSE_BAR_H, 0, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+  CustomDrawButton* button = new CustomDrawButton(theme_provider, IDR_CLOSE_BAR,
+      IDR_CLOSE_BAR_P, IDR_CLOSE_BAR_H, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
   return button;
 }
 
 void CustomDrawButton::SetBrowserTheme() {
   bool use_gtk = theme_provider_ && theme_provider_->UseGtkTheme();
 
   if (use_gtk && gtk_stock_name_) {
     gtk_button_set_image(
         GTK_BUTTON(widget()),
         gtk_image_new_from_stock(gtk_stock_name_, icon_size_));
     gtk_widget_set_size_request(widget(), -1, -1);
     gtk_widget_set_app_paintable(widget(), FALSE);
   } else {
     gtk_widget_set_size_request(widget(), button_base_.Width(),
                                 button_base_.Height());
 
     gtk_widget_set_app_paintable(widget(), TRUE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), use_gtk);
 }