GTK Themes: Fix painting issues where GTK theme engine was painting over buttons.

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/l10n_util.h"
@@ skipping 528 matching lines @@
     GtkWidget* left = NULL;
     GtkWidget* right = NULL;
     if (gtk_widget_get_direction(star) == GTK_TEXT_DIR_LTR) {
       left = toolbar->star_->widget();
       right = toolbar->go_->widget();
     } else {
       left = toolbar->go_->widget();
       right = toolbar->star_->widget();
     }
 
-    gint x = left->allocation.x;
-    gint y = left->allocation.y;
-    gint width = (right->allocation.x - left->allocation.x) +
-                 right->allocation.width;
-    gint height = (right->allocation.y - left->allocation.y) +
-                  right->allocation.height;
+    GdkRectangle rec = {
+      left->allocation.x,
+      left->allocation.y,
+      (right->allocation.x - left->allocation.x) + right->allocation.width,
+      (right->allocation.y - left->allocation.y) + right->allocation.height
+    };
 
     // Make sure our off screen entry has the correct base color if we're in
     // secure mode.
     gtk_widget_modify_base(
         toolbar->offscreen_entry_.get(), GTK_STATE_NORMAL,
         (toolbar->browser_->toolbar_model()->GetSchemeSecurityLevel() ==
          ToolbarModel::SECURE) ?
         &kSecureColor : NULL);
 
     GtkStyle* gtk_owned_style =
         gtk_rc_get_style(toolbar->offscreen_entry_.get());
     // GTK owns the above and we're going to have to make our own copy of it
     // that we can edit.
     GtkStyle* our_style = gtk_style_copy(gtk_owned_style);
     our_style = gtk_style_attach(our_style, location_hbox->window);
 
     // TODO(erg): Draw the focus ring if appropriate...
 
     // We're using GTK rendering; draw a GTK entry widget onto the background.
     gtk_paint_shadow(our_style, location_hbox->window,
-                     GTK_STATE_NORMAL, GTK_SHADOW_IN, NULL,
+                     GTK_STATE_NORMAL, GTK_SHADOW_IN, &rec,
                      location_hbox, "entry",
-                     x, y, width, height);
+                     rec.x, rec.y, rec.width, rec.height);
 
     // Draw the interior background (not all themes draw the entry background
     // above; this is a noop on themes that do).
     gint xborder = our_style->xthickness;
     gint yborder = our_style->ythickness;
     gtk_paint_flat_box(our_style, location_hbox->window,
-                       GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL,
+                       GTK_STATE_NORMAL, GTK_SHADOW_NONE, &rec,
                        location_hbox, "entry_bg",
-                       x + xborder, y + yborder,
-                       width - 2 * xborder,
-                       height - 2 * yborder);
+                       rec.x + xborder, rec.y + yborder,
+                       rec.width - 2 * xborder,
+                       rec.height - 2 * yborder);
 
     g_object_unref(our_style);
   }
 
   return FALSE;
 }
 
 // static
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button,
                                       BrowserToolbarGtk* toolbar) {
@@ skipping 101 matching lines @@
       g_signal_stop_emission_by_name(menu, "move-current");
     default:
       break;
   }
 }
 
 bool BrowserToolbarGtk::ShouldOnlyShowLocation() const {
   // If we're a popup window, only show the location bar (omnibox).
   return browser_->type() != Browser::TYPE_NORMAL;
 }