GTK: More removal of raw GtkWidget->allocation access.

BUG=79722
TEST=none


Review URL: http://codereview.chromium.org/8773025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113031 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/automation/testing_automation_provider_gtk.cc

@@ -43,7 +43,10 @@ void TestingAutomationProvider::WindowGetViewBounds(int handle,
     if (!widget)
       return;
     *success = true;
-    *bounds = gfx::Rect(widget->allocation.width, widget->allocation.height);
+
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    *bounds = gfx::Rect(allocation.width, allocation.height);
     gint x, y;
     if (screen_coordinates) {
       gfx::Point point = gtk_util::GetWidgetScreenPosition(widget);

chrome/browser/tab_contents/tab_contents_view_gtk.cc

@@ -162,7 +162,10 @@ void TabContentsViewGtk::GetContainerBounds(gfx::Rect* out) const {
   GdkWindow* expanded_window = gtk_widget_get_window(expanded_.get());
   if (expanded_window)
     gdk_window_get_origin(expanded_window, &x, &y);
-  out->SetRect(x + expanded_->allocation.x, y + expanded_->allocation.y,
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(expanded_.get(), &allocation);
+  out->SetRect(x + allocation.x, y + allocation.y,
                requested_size_.width(), requested_size_.height());
 }
 

chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc

@@ -135,14 +135,17 @@ gboolean OnDragIconExpose(GtkWidget* sender,
   cairo_paint(cr);
   cairo_destroy(cr);
 
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(sender, &allocation);
+
   // Paint the title text.
   gfx::CanvasSkiaPaint canvas(event, false);
   int text_x = gdk_pixbuf_get_width(data->favicon) + kBarButtonPadding;
-  int text_width = sender->allocation.width - text_x;
+  int text_width = allocation.width - text_x;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   canvas.DrawStringInt(data->text, base_font, data->text_color,
-                       text_x, 0, text_width, sender->allocation.height);
+                       text_x, 0, text_width, allocation.height);
 
   return TRUE;
 }

chrome/browser/ui/gtk/browser_titlebar.cc

@@ -852,8 +852,11 @@ void BrowserTitlebar::MaximizeButtonClicked() {
 
     gint x, y;
     gtk_window_get_position(window_, &x, &y);
-    gint width = widget->allocation.width;
-    gint height = widget->allocation.height;
+
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    gint width = allocation.width;
+    gint height = allocation.height;
 
     if (event->button.button == 3) {
       x = 0;

chrome/browser/ui/gtk/extensions/extension_popup_gtk.cc

@@ -178,5 +178,7 @@ void ExtensionPopupGtk::DestroyPopupWithoutResult() {
 }
 
 gfx::Rect ExtensionPopupGtk::GetViewBounds() {
-  return gfx::Rect(host_->view()->native_view()->allocation);
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(host_->view()->native_view(), &allocation);
+  return gfx::Rect(allocation);
 }

chrome/browser/ui/gtk/find_bar_gtk.cc

@@ -372,7 +372,9 @@ void FindBarGtk::UpdateUIForFindResult(const FindNotificationDetails& result,
   if (!result.selection_rect().IsEmpty()) {
     selection_rect_ = result.selection_rect();
     int xposition = GetDialogPosition(result.selection_rect()).x();
-    if (xposition != widget()->allocation.x)
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget(), &allocation);
+    if (xposition != allocation.x)
       Reposition();
   }
 
@@ -814,12 +816,9 @@ gboolean FindBarGtk::OnContentEventBoxExpose(GtkWidget* widget,
     // (*cough*Clearlooks*cough*) don't do any blending and use thickness to
     // make sure that widgets never overlap.
     int padding = gtk_widget_get_style(widget)->xthickness;
-    GdkRectangle rec = {
-      widget->allocation.x,
-      widget->allocation.y,
-      widget->allocation.width - padding,
-      widget->allocation.height
-    };
+    GdkRectangle rec;
+    gtk_widget_get_allocation(widget, &rec);
+    rec.width -= padding;
 
     gtk_util::DrawTextEntryBackground(bar->text_entry_, widget,
                                       &event->area, &rec);
@@ -831,11 +830,14 @@ gboolean FindBarGtk::OnContentEventBoxExpose(GtkWidget* widget,
 // Used to handle custom painting of |container_|.
 gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
                               FindBarGtk* bar) {
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+
   if (bar->theme_service_->UsingNativeTheme()) {
-    if (bar->container_width_ != widget->allocation.width ||
-        bar->container_height_ != widget->allocation.height) {
+    if (bar->container_width_ != allocation.width ||
+        bar->container_height_ != allocation.height) {
       std::vector<GdkPoint> mask_points = MakeFramePolygonPoints(
-          widget->allocation.width, widget->allocation.height, FRAME_MASK);
+          allocation.width, allocation.height, FRAME_MASK);
       GdkRegion* mask_region = gdk_region_polygon(&mask_points[0],
                                                   mask_points.size(),
                                                   GDK_EVEN_ODD_RULE);
@@ -844,8 +846,8 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
       gdk_window_shape_combine_region(widget->window, mask_region, 0, 0);
       gdk_region_destroy(mask_region);
 
-      bar->container_width_ = widget->allocation.width;
-      bar->container_height_ = widget->allocation.height;
+      bar->container_width_ = allocation.width;
+      bar->container_height_ = allocation.height;
     }
 
     GdkDrawable* drawable = GDK_DRAWABLE(e->window);
@@ -856,19 +858,19 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
 
     // Stroke the frame border.
     std::vector<GdkPoint> points = MakeFramePolygonPoints(
-        widget->allocation.width, widget->allocation.height, FRAME_STROKE);
+        allocation.width, allocation.height, FRAME_STROKE);
     gdk_draw_lines(drawable, gc, &points[0], points.size());
 
     g_object_unref(gc);
   } else {
-    if (bar->container_width_ != widget->allocation.width ||
-        bar->container_height_ != widget->allocation.height) {
+    if (bar->container_width_ != allocation.width ||
+        bar->container_height_ != allocation.height) {
       // Reset the shape.
       gdk_window_shape_combine_region(widget->window, NULL, 0, 0);
       SetDialogShape(bar->container_);
 
-      bar->container_width_ = widget->allocation.width;
-      bar->container_height_ = widget->allocation.height;
+      bar->container_width_ = allocation.width;
+      bar->container_height_ = allocation.height;
     }
 
     cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));

chrome/browser/ui/gtk/gtk_chrome_link_button.cc

@@ -137,11 +137,13 @@ static gboolean gtk_chrome_link_button_expose(GtkWidget* widget,
 
   // Draw the focus rectangle.
   if (gtk_widget_has_focus(widget)) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
     gtk_paint_focus(widget->style, widget->window,
                     gtk_widget_get_state(widget),
                     &event->area, widget, NULL,
-                    widget->allocation.x, widget->allocation.y,
-                    widget->allocation.width, widget->allocation.height);
+                    allocation.x, allocation.y,
+                    allocation.width, allocation.height);
   }
 
   return TRUE;

chrome/browser/ui/gtk/gtk_custom_menu_item.cc

@@ -205,16 +205,22 @@ static void gtk_custom_menu_item_expose_button(GtkWidget* hbox,
   if (base::i18n::IsRTL())
     std::swap(first_button, last_button);
 
-  int x = first_button->allocation.x;
-  int y = first_button->allocation.y;
-  int width = last_button->allocation.width + last_button->allocation.x -
-              first_button->allocation.x;
-  int height = last_button->allocation.height;
+  GtkAllocation first_allocation;
+  gtk_widget_get_allocation(first_button, &first_allocation);
+  GtkAllocation current_allocation;
+  gtk_widget_get_allocation(current_button, &current_allocation);
+  GtkAllocation last_allocation;
+  gtk_widget_get_allocation(last_button, &last_allocation);
+
+  int x = first_allocation.x;
+  int y = first_allocation.y;
+  int width = last_allocation.width + last_allocation.x - first_allocation.x;
+  int height = last_allocation.height;
 
   gtk_paint_box(hbox->style, hbox->window,
                 gtk_widget_get_state(current_button),
                 GTK_SHADOW_OUT,
-                &current_button->allocation, hbox, "button",
+                &current_allocation, hbox, "button",
                 x, y, width, height);
 
   // Propagate to the button's children.
@@ -248,16 +254,19 @@ static gboolean gtk_custom_menu_item_hbox_expose(GtkWidget* widget,
       GList* next_item = g_list_next(current_item);
       if (next_item && GTK_IS_BUTTON(next_item->data)) {
         GtkWidget* current_button = GTK_WIDGET(current_item->data);
-        GtkAllocation child_alloc =
-            gtk_bin_get_child(GTK_BIN(current_button))->allocation;
+        GtkAllocation button_allocation;
+        gtk_widget_get_allocation(current_button, &button_allocation);
+        GtkAllocation child_alloc;
+        gtk_widget_get_allocation(gtk_bin_get_child(GTK_BIN(current_button)),
+                                  &child_alloc);
         int half_offset = widget->style->xthickness / 2;
         gtk_paint_vline(widget->style, widget->window,
                         gtk_widget_get_state(current_button),
                         &event->area, widget, "button",
                         child_alloc.y,
                         child_alloc.y + child_alloc.height,
-                        current_button->allocation.x +
-                        current_button->allocation.width - half_offset);
+                        button_allocation.x +
+                        button_allocation.width - half_offset);
       }
     }
   }
@@ -368,7 +377,8 @@ void gtk_custom_menu_item_receive_motion_event(GtkCustomMenuItem* menu_item,
   GList* current = menu_item->button_widgets;
   for (; current != NULL; current = current->next) {
     GtkWidget* current_widget = GTK_WIDGET(current->data);
-    GtkAllocation alloc = current_widget->allocation;
+    GtkAllocation alloc;
+    gtk_widget_get_allocation(current_widget, &alloc);
     int offset_x, offset_y;
     gtk_widget_translate_coordinates(current_widget, GTK_WIDGET(menu_item),
                                      0, 0, &offset_x, &offset_y);

chrome/browser/ui/gtk/gtk_input_event_box.cc

@@ -123,7 +123,7 @@ static void gtk_input_event_box_size_allocate(GtkWidget* widget,
                                               GtkAllocation* allocation) {
   g_return_if_fail(GTK_IS_INPUT_EVENT_BOX(widget));
 
-  widget->allocation = *allocation;
+  gtk_widget_set_allocation(widget, allocation);
 
   GtkInputEventBoxPrivate* priv = GTK_INPUT_EVENT_BOX_GET_PRIVATE(widget);
   if (priv->event_window) {

chrome/browser/ui/gtk/gtk_theme_service.cc

@@ -1217,11 +1217,13 @@ gboolean GtkThemeService::OnSeparatorExpose(GtkWidget* widget,
       static_cast<double>(bottom_color.green / 257) / 255.0,
       static_cast<double>(bottom_color.blue / 257) / 255.0, };
 
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+
   cairo_pattern_t* pattern =
-      cairo_pattern_create_linear(widget->allocation.x, widget->allocation.y,
-                                  widget->allocation.x,
-                                  widget->allocation.y +
-                                  widget->allocation.height);
+      cairo_pattern_create_linear(allocation.x, allocation.y,
+                                  allocation.x,
+                                  allocation.y + allocation.height);
   cairo_pattern_add_color_stop_rgb(
       pattern, 0.0,
       kTopSeparatorColor[0], kTopSeparatorColor[1], kTopSeparatorColor[2]);
@@ -1233,12 +1235,11 @@ gboolean GtkThemeService::OnSeparatorExpose(GtkWidget* widget,
       bottom_color_rgb[0], bottom_color_rgb[1], bottom_color_rgb[2]);
   cairo_set_source(cr, pattern);
 
-  double start_x = 0.5 + widget->allocation.x;
+  double start_x = 0.5 + allocation.x;
   cairo_new_path(cr);
   cairo_set_line_width(cr, 1.0);
-  cairo_move_to(cr, start_x, widget->allocation.y);
-  cairo_line_to(cr, start_x,
-                widget->allocation.y + widget->allocation.height);
+  cairo_move_to(cr, start_x, allocation.y);
+  cairo_line_to(cr, start_x, allocation.y + allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);

chrome/browser/ui/gtk/menu_gtk.cc

@@ -96,7 +96,7 @@ void SetupImageIcon(GtkWidget* button,
 // Returns the new Y position of the popup menu.
 int CalculateMenuYPosition(const GdkRectangle* screen_rect,
                            const GtkRequisition* menu_req,
-                           const GtkWidget* widget, const int y) {
+                           GtkWidget* widget, const int y) {
   CHECK(screen_rect);
   CHECK(menu_req);
   // If the menu would run off the bottom of the screen, and there is enough
@@ -107,8 +107,11 @@ int CalculateMenuYPosition(const GdkRectangle* screen_rect,
   const int screen_bottom = screen_rect->y + screen_rect->height;
   const int menu_bottom = y + menu_req->height;
   int alternate_y = y - menu_req->height;
-  if (widget)
-    alternate_y -= widget->allocation.height;
+  if (widget) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    alternate_y -= allocation.height;
+  }
   if (menu_bottom >= screen_bottom && alternate_y >= screen_top)
     return alternate_y;
   return y;
@@ -695,11 +698,14 @@ void MenuGtk::WidgetMenuPositionFunc(GtkMenu* menu,
   gdk_screen_get_monitor_geometry(screen, monitor,
                                   &screen_rect);
 
-  if (GTK_WIDGET_NO_WINDOW(widget)) {
-    *x += widget->allocation.x;
-    *y += widget->allocation.y;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+
+  if (!gtk_widget_get_has_window(widget)) {
+    *x += allocation.x;
+    *y += allocation.y;
   }
-  *y += widget->allocation.height;
+  *y += allocation.height;
 
   bool start_align =
     !!g_object_get_data(G_OBJECT(widget), "left-align-popup");
@@ -707,7 +713,7 @@ void MenuGtk::WidgetMenuPositionFunc(GtkMenu* menu,
     start_align = !start_align;
 
   if (!start_align)
-    *x += widget->allocation.width - menu_req.width;
+    *x += allocation.width - menu_req.width;
 
   *y = CalculateMenuYPosition(&screen_rect, &menu_req, widget, *y);
 

chrome/browser/ui/gtk/nine_box.cc

@@ -175,8 +175,10 @@ void NineBox::RenderTopCenterStrip(cairo_t* cr, int x, int y,
 }
 
 void NineBox::ContourWidget(GtkWidget* widget) const {
-  int width = widget->allocation.width;
-  int height = widget->allocation.height;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  int width = allocation.width;
+  int height = allocation.height;
   int x1 = gdk_pixbuf_get_width(images_[0]);
   int x2 = width - gdk_pixbuf_get_width(images_[2]);
 

chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc

@@ -417,15 +417,17 @@ gboolean BalloonViewImpl::OnContentsExpose(GtkWidget* sender,
   gdk_cairo_rectangle(cr, &event->area);
   cairo_clip(cr);
 
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(sender, &allocation);
+
   // According to a discussion on a mailing list I found, these degenerate
   // paths are the officially supported way to draw points in Cairo.
   cairo_set_source_rgb(cr, 0, 0, 0);
   cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
   cairo_set_line_width(cr, 1.0);
-  cairo_move_to(cr, 0.5, sender->allocation.height - 0.5);
+  cairo_move_to(cr, 0.5, allocation.height - 0.5);
   cairo_close_path(cr);
-  cairo_move_to(cr, sender->allocation.width - 0.5,
-                    sender->allocation.height - 0.5);
+  cairo_move_to(cr, allocation.width - 0.5, allocation.height - 0.5);
   cairo_close_path(cr);
   cairo_stroke(cr);
   cairo_destroy(cr);

chrome/browser/ui/gtk/status_bubble_gtk.cc

@@ -97,7 +97,9 @@ void StatusBubbleGtk::SetStatusTextToURL() {
   if (!parent || !gtk_widget_get_realized(parent))
     return;
 
-  int desired_width = parent->allocation.width;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(parent, &allocation);
+  int desired_width = allocation.width;
   if (!expanded()) {
     expand_timer_.Stop();
     expand_timer_.Start(FROM_HERE,
@@ -190,6 +192,9 @@ void StatusBubbleGtk::MouseMoved(
     GtkRequisition requisition;
     gtk_widget_size_request(container_.get(), &requisition);
 
+    GtkAllocation parent_allocation;
+    gtk_widget_get_allocation(parent, &parent_allocation);
+
     // Get our base position (that is, not including the current offset)
     // relative to the origin of the root window.
     gint toplevel_x = 0, toplevel_y = 0;
@@ -198,9 +203,9 @@ void StatusBubbleGtk::MouseMoved(
         gtk_util::GetWidgetRectRelativeToToplevel(parent);
     gfx::Rect bubble_rect(
         toplevel_x + parent_rect.x() +
-            (ltr ? 0 : parent->allocation.width - requisition.width),
+            (ltr ? 0 : parent_allocation.width - requisition.width),
         toplevel_y + parent_rect.y() +
-            parent->allocation.height - requisition.height,
+            parent_allocation.height - requisition.height,
         requisition.width,
         requisition.height);
 
@@ -328,7 +333,9 @@ void StatusBubbleGtk::SetFlipHorizontally(bool flip_horizontally) {
 }
 
 void StatusBubbleGtk::ExpandURL() {
-  start_width_ = label_.get()->allocation.width;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(label_.get(), &allocation);
+  start_width_ = allocation.width;
   expand_animation_.reset(new ui::SlideAnimation(this));
   expand_animation_->SetTweenType(ui::Tween::LINEAR);
   expand_animation_->Show();