GTK: Move to gtk_widget_get_allocation() for some of chrome/browser/ui/gtk/

chrome/browser/ui/gtk/custom_button.cc

 // Copyright (c) 2011 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/gtk/custom_button.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
@@ skipping 72 matching lines @@
       paint_state == GTK_STATE_NORMAL;
   CairoCachedSurface* pixbuf = PixbufForState(paint_state);
   CairoCachedSurface* hover_pixbuf = PixbufForState(GTK_STATE_PRELIGHT);
 
   if (!pixbuf || !pixbuf->valid())
     return FALSE;
   if (animating_hover && (!hover_pixbuf || !hover_pixbuf->valid()))
     return FALSE;
 
   cairo_t* cairo_context = gdk_cairo_create(GDK_DRAWABLE(widget->window));
-  cairo_translate(cairo_context, widget->allocation.x, widget->allocation.y);
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  cairo_translate(cairo_context, allocation.x, allocation.y);
 
   if (flipped_) {
     // Horizontally flip the image for non-LTR/RTL reasons.
-    cairo_translate(cairo_context, widget->allocation.width, 0.0f);
+    cairo_translate(cairo_context, allocation.width, 0.0f);
     cairo_scale(cairo_context, -1.0f, 1.0f);
   }
 
   // The widget might be larger than the pixbuf. Paint the pixbuf flush with the
   // start of the widget (left for LTR, right for RTL) and its bottom.
   gfx::Rect bounds = gfx::Rect(0, 0, pixbuf->Width(), 0);
   int x = gtk_util::MirroredLeftPointForRect(widget, bounds);
-  int y = widget->allocation.height - pixbuf->Height();
+  int y = allocation.height - pixbuf->Height();
 
   if (background_image_->valid()) {
     background_image_->SetSource(cairo_context, x, y);
     cairo_paint(cairo_context);
   }
 
   pixbuf->SetSource(cairo_context, x, y);
   cairo_paint(cairo_context);
 
   if (animating_hover) {
@@ skipping 174 matching lines @@
   SetBrowserTheme();
 }
 
 void CustomDrawButton::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
   SetBrowserTheme();
 }
 
+int CustomDrawButton::WidgetWidth() const {
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget_.get(), &allocation);
+  return allocation.width;
+}
+
 int CustomDrawButton::SurfaceWidth() const {
   return button_base_.Width();
 }
 
 int CustomDrawButton::SurfaceHeight() const {
   return button_base_.Height();
 }
 
 void CustomDrawButton::SetPaintOverride(GtkStateType state) {
   button_base_.set_paint_override(state);
@@ skipping 47 matching lines @@
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
   return !forcing_chrome_theme_ && theme_service_ &&
       theme_service_->UsingNativeTheme();
 }