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

chrome/browser/ui/gtk/menu_gtk.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/menu_gtk.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 78 matching lines @@
   g_signal_connect(menu, "show", G_CALLBACK(OnSubmenuShowButtonImage), button);
 }
 
 // Popup menus may get squished if they open up too close to the bottom of the
 // screen. This function takes the size of the screen, the size of the menu,
 // an optional widget, the Y position of the mouse click, and adjusts the popup
 // menu's Y position to make it fit if it's possible to do so.
 // 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
   // screen space upwards to accommodate the menu, then pop upwards. If there
   // is a widget, then also move the anchor point to the top of the widget
   // rather than the bottom.
   const int screen_top = screen_rect->y;
   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;
 }
 
 }  // namespace
 
 GtkWidget* MenuGtk::Delegate::GetDefaultImageForCommandId(int command_id) {
   const char* stock;
   switch (command_id) {
@@ skipping 566 matching lines @@
   gtk_widget_size_request(GTK_WIDGET(menu), &menu_req);
 
   gdk_window_get_origin(widget->window, x, y);
   GdkScreen *screen = gtk_widget_get_screen(widget);
   gint monitor = gdk_screen_get_monitor_at_point(screen, *x, *y);
 
   GdkRectangle screen_rect;
   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");
   if (base::i18n::IsRTL())
     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);
 
   *push_in = FALSE;
 }
 
 // static
 void MenuGtk::PointMenuPositionFunc(GtkMenu* menu,
                                     int* x,
                                     int* y,
@@ skipping 185 matching lines @@
       gtk_widget_hide(widget);
     }
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }