GTK: Step 1 of tab strip refresh.

chrome/browser/ui/gtk/tabs/tab_strip_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 "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 1261 matching lines @@
 }
 
 bool TabStripGtk::EndDrag(bool canceled) {
   return drag_controller_.get() ? drag_controller_->EndDrag(canceled) : false;
 }
 
 bool TabStripGtk::HasAvailableDragActions() const {
   return model_->delegate()->GetDragActions() != 0;
 }
 
-ThemeService* TabStripGtk::GetThemeProvider() {
+GtkThemeService* TabStripGtk::GetThemeProvider() {
   return theme_service_;
 }
 
 TabStripMenuController* TabStripGtk::GetTabStripMenuControllerForTab(
     TabGtk* tab) {
   return new TabStripMenuController(tab, model(), GetIndexOfTab(tab));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripGtk, MessageLoop::Observer implementation:
@@ skipping 877 matching lines @@
         break;
       }
       ++t;
     }
   }
   return static_cast<int>(tabs_to_paint->size()) == num_rects;
 }
 
 void TabStripGtk::PaintOnlyFavicons(GdkEventExpose* event,
                                     const std::vector<int>& tabs_to_paint) {
-  for (size_t i = 0; i < tabs_to_paint.size(); ++i)
-    GetTabAt(tabs_to_paint[i])->PaintFaviconArea(event);
+  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(event->window));
+  for (size_t i = 0; i < tabs_to_paint.size(); ++i) {
+    cairo_save(cr);
+    GetTabAt(tabs_to_paint[i])->PaintFaviconArea(tabstrip_.get(), cr);
+    cairo_restore(cr);
+  }
+
+  cairo_destroy(cr);
 }
 
 CustomDrawButton* TabStripGtk::MakeNewTabButton() {
   CustomDrawButton* button = new CustomDrawButton(IDR_NEWTAB_BUTTON,
       IDR_NEWTAB_BUTTON_P, IDR_NEWTAB_BUTTON_H, 0);
 
   // Let the middle mouse button initiate clicks as well.
   gtk_util::SetButtonTriggersNavigation(button->widget());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnNewTabClickedThunk), this);
   gtk_widget_set_can_focus(button->widget(), FALSE);
   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0);
 
   return button;
 }