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

chrome/browser/ui/gtk/gtk_custom_menu_item.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/gtk_custom_menu_item.h"
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/ui/gtk/gtk_custom_menu.h"
 
 // This method was autogenerated by the program glib-genmarshall, which
@@ skipping 187 matching lines @@
 
   GtkWidget* last_button = current_button;
   for (GList* i = button_item; i && GTK_IS_BUTTON(i->data);
        i = g_list_next(i)) {
     last_button = GTK_WIDGET(i->data);
   }
 
   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.
   gtk_container_propagate_expose(
       GTK_CONTAINER(current_button),
       gtk_bin_get_child(GTK_BIN(current_button)),
       event);
 }
 
 static gboolean gtk_custom_menu_item_hbox_expose(GtkWidget* widget,
@@ skipping 13 matching lines @@
   // As a separate pass, draw the buton separators above. We need to draw the
   // separators in a separate pass because we are drawing on top of the
   // buttons. Otherwise, the vlines are overwritten by the next button.
   for (GList* current_item = menu_item->all_widgets;
        current_item != NULL; current_item = g_list_next(current_item)) {
     if (GTK_IS_BUTTON(current_item->data)) {
       // Check to see if this is the last button in a run.
       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);
       }
     }
   }
 
   // Finally, draw the selected item on top of the separators so there are no
   // artifacts inside the button area.
   GList* selected = g_list_find(menu_item->all_widgets,
                                 menu_item->currently_selected_button);
   if (selected) {
     gtk_custom_menu_item_expose_button(widget, event, selected);
@@ skipping 90 matching lines @@
 
   menu_item->all_widgets = g_list_append(menu_item->all_widgets, fixed);
 }
 
 void gtk_custom_menu_item_receive_motion_event(GtkCustomMenuItem* menu_item,
                                                gdouble x, gdouble y) {
   GtkWidget* new_selected_widget = NULL;
   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);
     if (x >= offset_x && x < (offset_x + alloc.width) &&
         y >= offset_y && y < (offset_y + alloc.height)) {
       new_selected_widget = current_widget;
       break;
     }
   }
 
@@ skipping 87 matching lines @@
                                          gpointer callback_data) {
   // Even though we're filtering |all_widgets| on GTK_IS_BUTTON(), this isn't
   // equivalent to |button_widgets| because we also want the button-labels.
   for (GList* i = menu_item->all_widgets; i && GTK_IS_BUTTON(i->data);
        i = g_list_next(i)) {
     if (GTK_IS_BUTTON(i->data)) {
       callback(GTK_WIDGET(i->data), callback_data);
     }
   }
 }