Re-land r51526

chrome/browser/views/tab_contents/tab_contents_view_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 "chrome/browser/views/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
@@ skipping 199 matching lines @@
 gfx::NativeWindow TabContentsViewGtk::GetTopLevelNativeWindow() const {
   GtkWidget* window = gtk_widget_get_ancestor(GetNativeView(), GTK_TYPE_WINDOW);
   return window ? GTK_WINDOW(window) : NULL;
 }
 
 void TabContentsViewGtk::GetContainerBounds(gfx::Rect* out) const {
   GetBounds(out, false);
 
   // Callers expect the requested bounds not the actual bounds. For example,
   // during init callers expect 0x0, but Gtk layout enforces a min size of 1x1.
-  out->set_width(GetNativeView()->requisition.width);
-  out->set_height(GetNativeView()->requisition.height);
+  GtkRequisition requisition;
+  gtk_widget_get_child_requisition(GetNativeView(), &requisition);
+  out->set_width(requisition.width);
+  out->set_height(requisition.height);
 }
 
 void TabContentsViewGtk::StartDragging(const WebDropData& drop_data,
                                        WebDragOperationsMask ops,
                                        const SkBitmap& image,
                                        const gfx::Point& image_offset) {
   drag_source_->StartDragging(drop_data, ops, &last_mouse_down_,
                               image, image_offset);
 }
 
@@ skipping 220 matching lines @@
 // not NULL, else our delegate.
 gboolean TabContentsViewGtk::OnMouseMove(GtkWidget* widget,
                                          GdkEventMotion* event) {
   if (sad_tab_ != NULL)
     WidgetGtk::OnMotionNotify(widget, event);
   else if (tab_contents()->delegate())
     tab_contents()->delegate()->ContentsMouseEvent(
         tab_contents(), views::Screen::GetCursorScreenPoint(), true);
   return FALSE;
 }