Test + Fix for GTK window resizing when using toolkit views.

views/widget/widget_gtk.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 "views/widget/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 
@@ skipping 313 matching lines @@
 void WidgetGtk::AddChild(GtkWidget* child) {
   gtk_container_add(GTK_CONTAINER(window_contents_), child);
 }
 
 void WidgetGtk::RemoveChild(GtkWidget* child) {
   // We can be called after the contents widget has been destroyed, e.g. any
   // NativeViewHost not removed from the view hierarchy before the window is
   // closed.
   if (GTK_IS_CONTAINER(window_contents_)) {
     gtk_container_remove(GTK_CONTAINER(window_contents_), child);
-    gtk_views_fixed_set_use_allocated_size(child, false);
+    gtk_views_fixed_set_widget_size(child, 0, 0);
   }
 }
 
 void WidgetGtk::ReparentChild(GtkWidget* child) {
   gtk_widget_reparent(child, window_contents_);
 }
 
 void WidgetGtk::PositionChild(GtkWidget* child, int x, int y, int w, int h) {
-  GtkAllocation alloc = { x, y, w, h };
-  gtk_widget_size_allocate(child, &alloc);
-  gtk_views_fixed_set_use_allocated_size(child, true);
+  gtk_views_fixed_set_widget_size(child, w, h);
   gtk_fixed_move(GTK_FIXED(window_contents_), child, x, y);
 }
 
 void WidgetGtk::DoDrag(const OSExchangeData& data, int operation) {
   const OSExchangeDataProviderGtk& data_provider =
       static_cast<const OSExchangeDataProviderGtk&>(data.provider());
   GtkTargetList* targets = data_provider.GetTargetList();
   GdkEvent* current_event = gtk_get_current_event();
   const OSExchangeDataProviderGtk& provider(
       static_cast<const OSExchangeDataProviderGtk&>(data.provider()));
@@ skipping 66 matching lines @@
   ignore_drag_leave_ = false;
   drop_target_.reset(NULL);
 }
 
 // static
 RootView* WidgetGtk::GetRootViewForWidget(GtkWidget* widget) {
   gpointer user_data = g_object_get_data(G_OBJECT(widget), "root-view");
   return static_cast<RootView*>(user_data);
 }
 
+void WidgetGtk::GetRequestedSize(gfx::Size* out) const {
+  int width, height;
+  if (GTK_IS_VIEWS_FIXED(widget_) &&
+      gtk_views_fixed_get_widget_size(GetNativeView(), &width, &height)) {
+    out->SetSize(width, height);
+  } else {
+    GtkRequisition requisition;
+    gtk_widget_get_child_requisition(GetNativeView(), &requisition);
+    out->SetSize(requisition.width, requisition.height);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetGtk, ActiveWindowWatcherX::Observer implementation:
 
 void WidgetGtk::ActiveWindowChanged(GdkWindow* active_window) {
   if (!GetNativeView())
     return;
 
   bool was_active = IsActive();
   is_active_ = (active_window == GTK_WIDGET(GetNativeView())->window);
   if (!is_active_ && active_window && type_ != TYPE_CHILD) {
@@ skipping 1173 matching lines @@
     GtkWindow* window = GTK_WINDOW(element->data);
     DCHECK(window);
     RootView *root_view = FindRootView(window);
     if (root_view)
       root_view->NotifyLocaleChanged();
   }
   g_list_free(window_list);
 }
 
 }  // namespace views