GTK: Step 1 of tab strip refresh.

chrome/browser/ui/gtk/tabs/dragged_view_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/dragged_view_gtk.h"
 
 #include <gdk/gdk.h>
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tabs/drag_data.h"
 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/browser/renderer_host/backing_store_gtk.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/gtk/gtk_screen_utils.h"
 #include "ui/base/x/x11_util.h"
@@ skipping 28 matching lines @@
       mini_width_(-1),
       normal_width_(-1),
       attached_(false),
       parent_window_width_(-1),
       mouse_tab_offset_(mouse_tab_offset),
       attached_tab_size_(TabRendererGtk::GetMinimumSelectedSize()),
       contents_size_(contents_size),
       close_animation_(this) {
   std::vector<TabContents*> data_sources(drag_data_->GetDraggedTabsContents());
   for (size_t i = 0; i < data_sources.size(); i++) {
-    renderers_.push_back(new TabRendererGtk(ThemeServiceFactory::GetForProfile(
+    renderers_.push_back(new TabRendererGtk(GtkThemeService::GetFrom(
         Profile::FromBrowserContext(data_sources[i]->browser_context()))));
   }
 
   for (size_t i = 0; i < drag_data_->size(); i++) {
     TabContentsWrapper* wrapper =
         TabContentsWrapper::GetCurrentWrapperForContents(
             drag_data_->get(i)->contents_->tab_contents());
     renderers_[i]->UpdateData(
         drag_data_->get(i)->contents_->tab_contents(),
         wrapper->extension_tab_helper()->is_app(),
@@ skipping 258 matching lines @@
 
   // Blit the rendered bitmap into a pixmap.  Any pixel set in the pixmap will
   // be opaque in the container window.
   if (!attached_)
     cairo_scale(cairo_context, kScalingFactor, kScalingFactor);
   for (size_t i = 0; i < renderers_.size(); i++) {
     if (static_cast<int>(i) == 0)
       cairo_set_operator(cairo_context, CAIRO_OPERATOR_SOURCE);
     else
       cairo_set_operator(cairo_context, CAIRO_OPERATOR_OVER);
-    PaintTab(i, cairo_context, container_->allocation.width);
+    PaintTab(i, container_, cairo_context, container_->allocation.width);
   }
 
   if (!attached_) {
     // Make the render area depiction opaque (leaving enough room for the
     // border).
     cairo_identity_matrix(cairo_context);
     // On Lucid running VNC, the X server will reject RGBA (1,1,1,1) as an
     // invalid value below in gdk_window_shape_combine_mask(). Using (0,0,0,1)
     // instead. The value doesn't really matter, as long as the alpha is not 0.
     cairo_set_source_rgba(cairo_context, 0.0f, 0.0f, 0.0f, 1.0f);
@@ skipping 59 matching lines @@
     cairo_stroke(cr);
   }
 
   // Draw the tab.
   if (!attached_)
     cairo_scale(cr, kScalingFactor, kScalingFactor);
   // Painting all but the active tab first, from last to first.
   for (int i = renderers_.size() - 1; i >= 0; i--) {
     if (i == drag_data_->source_tab_index())
       continue;
-    PaintTab(i, cr, widget->allocation.width);
+    PaintTab(i, widget, cr, widget->allocation.width);
   }
   // Painting the active tab last, so that it appears on top.
-  PaintTab(drag_data_->source_tab_index(), cr, widget->allocation.width);
+  PaintTab(drag_data_->source_tab_index(), widget, cr,
+           widget->allocation.width);
 
   cairo_destroy(cr);
 
   // We've already drawn the tab, so don't propagate the expose-event signal.
   return TRUE;
 }
 
-void DraggedViewGtk::PaintTab(int index, cairo_t* cr, int widget_width) {
+void DraggedViewGtk::PaintTab(int index, GtkWidget* widget, cairo_t* cr,
+                              int widget_width) {

[dpapad, 2011/10/28 16:56:52]

Drive by comment. |widget_width| argument can now be removed, since |widget|
itself is passed as an arg. 

   renderers_[index]->set_mini(drag_data_->get(index)->mini_);
-  cairo_surface_t* surface = renderers_[index]->PaintToSurface();
+  cairo_surface_t* surface = renderers_[index]->PaintToSurface(widget, cr);
 
   int paint_at = 0;
   if (!base::i18n::IsRTL()) {
     paint_at = std::max(GetWidthInTabStripFromTo(0, index) - 16, 0);
   } else {
     paint_at = GetTotalWidthInTabStrip() -
         GetWidthInTabStripFromTo(0, index + 1);
     if (!attached_) {
       paint_at = widget_width / kScalingFactor -
           GetWidthInTabStripFromTo(0, index + 1);
     }
   }
 
   cairo_set_source_surface(cr, surface, paint_at, 0);
   cairo_paint(cr);
   cairo_surface_destroy(surface);
 }