GTK: Closing in on being completely GSEALed.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2012 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/browser_window_gtk.h"
 
 #include <dlfcn.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 404 matching lines @@
   // Set the initial background color of widgets.
   SetBackgroundColor();
   HideUnsupportedWindowFeatures();
 }
 
 gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget,
                                                GdkEventExpose* event) {
   TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::OnCustomFrameExpose");
 
   // Draw the default background.
-  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
+  cairo_t* cr = gdk_cairo_create(gtk_widget_get_window(widget));
   gdk_cairo_rectangle(cr, &event->area);
   cairo_clip(cr);
 
   if (UsingCustomPopupFrame()) {
     DrawPopupFrame(cr, widget, event);
   } else {
     DrawCustomFrame(cr, widget, event);
   }
 
   DrawContentShadow(cr);
@@ skipping 1563 matching lines @@
   GtkAllocation render_area_floating_container_allocation;
   gtk_widget_get_allocation(render_area_floating_container_,
                             &render_area_floating_container_allocation);
   return gfx::Size(window_container_allocation.width -
                    render_area_floating_container_allocation.width,
                    window_container_allocation.height -
                    render_area_floating_container_allocation.height);
 }
 
 void BrowserWindowGtk::InvalidateWindow() {
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(GTK_WIDGET(window_), &allocation);
   gdk_window_invalidate_rect(gtk_widget_get_window(GTK_WIDGET(window_)),
-                             &GTK_WIDGET(window_)->allocation, TRUE);
+                             &allocation, TRUE);
 }
 
 void BrowserWindowGtk::SaveWindowPosition() {
   // Browser::SaveWindowPlacement is used for session restore.
   ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
   if (IsMaximized())
     show_state = ui::SHOW_STATE_MAXIMIZED;
   else if (IsMinimized())
     show_state = ui::SHOW_STATE_MINIMIZED;
 
@@ skipping 499 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }