GTK: A bunch more removal of deprecated raw GtkWidget access, focusing on GtkWidget->window

webkit/tools/test_shell/test_shell_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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 358 matching lines @@
 void TestShell::TestFinished() {
   if(!test_is_pending_)
     return;
 
   test_is_pending_ = false;
   MessageLoop::current()->Quit();
 }
 
 void TestShell::SizeTo(int width, int height) {
   GtkWidget* widget = m_webViewHost->view_handle();
-  if (widget->allocation.width == width &&
-      widget->allocation.height == height) {
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(widget, &allocation);
+  if (allocation.width == width &&
+      allocation.height == height) {

[tony, 2012/01/04 19:08:01]

Nit: This condition probably fits on a single line now.

     // Nothing to do.
     return;
   }
 
   gtk_widget_set_size_request(widget, width, height);
-  if (widget->allocation.width > width ||
-      widget->allocation.height > height) {
+  if (allocation.width > width ||
+      allocation.height > height) {

[tony, 2012/01/04 19:08:01]

Nit: This condition probably fits on a single line now.

     // We've been sized smaller.  Shrink the window so it snaps back to the
     // appropriate size.
     gtk_window_resize(GTK_WINDOW(m_mainWnd), 1, 1);
   }
 
   // We've been asked to size the content area to a particular size.
   // GTK works asynchronously: you request a size and then it
   // eventually becomes that size.  But layout tests need to be sure
   // the resize has gone into WebKit by the time SizeTo() returns.
   // Force the webkit resize to happen now.
@@ skipping 173 matching lines @@
   switch (resource_id) {
     case IDR_BROKENIMAGE:
       resource_id = IDR_BROKENIMAGE_TESTSHELL;
       break;
     case IDR_TEXTAREA_RESIZER:
       resource_id = IDR_TEXTAREA_RESIZER_TESTSHELL;
       break;
   }
   return TestShell::ResourceProvider(resource_id);
 }