GTK: Remove deprecated methods and replace them with the new standard calls.

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 <gtk/gtk.h>

[Lei Zhang, 2011/12/09 20:57:33]

nit: C includes before C++ includes.

 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"
@@ skipping 755 matching lines @@
   newtab_button_.reset(MakeNewTabButton());
   newtab_surface_bounds_.SetRect(0, 0, newtab_button_->SurfaceWidth(),
                                  newtab_button_->SurfaceHeight());
 
   gtk_widget_show_all(tabstrip_.get());
 
   bounds_ = GetInitialWidgetBounds(tabstrip_.get());
 
   if (drop_indicator_width == 0) {
     // Direction doesn't matter, both images are the same size.
-    GdkPixbuf* drop_image = GetDropArrowImage(true);
+    GdkPixbuf* drop_image = GetDropArrowImage(true)->ToGdkPixbuf();
     drop_indicator_width = gdk_pixbuf_get_width(drop_image);
     drop_indicator_height = gdk_pixbuf_get_height(drop_image);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
 
   ViewIDUtil::SetDelegateForWidget(widget(), this);
 }
@@ skipping 127 matching lines @@
   int x, y;
   if (!gtk_widget_translate_coordinates(widget(), target,
       -widget()->allocation.x, 0, &x, &y)) {
     // If the tab strip isn't showing, give the coordinates relative to the
     // toplevel instead.
     if (!gtk_widget_translate_coordinates(
         gtk_widget_get_toplevel(widget()), target, 0, 0, &x, &y)) {
       NOTREACHED();
     }
   }
-  if (GTK_WIDGET_NO_WINDOW(target)) {
-    x += target->allocation.x;
-    y += target->allocation.y;
+  if (!gtk_widget_get_has_window(target)) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(target, &allocation);
+    x += allocation.x;
+    y += allocation.y;
   }
   return gfx::Point(x, y);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ViewIDUtil::Delegate implementation
 
 GtkWidget* TabStripGtk::GetWidgetForViewID(ViewID view_id) {
   if (GetTabCount() > 0) {
     if (view_id == VIEW_ID_TAB_LAST) {
@@ skipping 773 matching lines @@
       drop_info_->CreateContainer();
     } else if (drop_info_->drop_index == index &&
                drop_info_->drop_before == drop_before) {
       return;
     }
 
     drop_info_->drop_index = index;
     drop_info_->drop_before = drop_before;
     if (is_beneath == drop_info_->point_down) {
       drop_info_->point_down = !is_beneath;
-      drop_info_->drop_arrow= GetDropArrowImage(drop_info_->point_down);
+      drop_info_->drop_arrow = GetDropArrowImage(drop_info_->point_down);
     }
   }
 
   gtk_window_move(GTK_WINDOW(drop_info_->container),
                   drop_bounds.x(), drop_bounds.y());
   gtk_window_resize(GTK_WINDOW(drop_info_->container),
                     drop_bounds.width(), drop_bounds.height());
 }
 
 bool TabStripGtk::CompleteDrop(guchar* data, bool is_plain_text) {
@@ skipping 33 matching lines @@
     params.disposition = CURRENT_TAB;
     params.source_contents = model_->GetTabContentsAt(drop_index);
   }
 
   browser::Navigate(&params);
 
   return true;
 }
 
 // static
-GdkPixbuf* TabStripGtk::GetDropArrowImage(bool is_down) {
-  return ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+gfx::Image* TabStripGtk::GetDropArrowImage(bool is_down) {
+  return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
 // TabStripGtk::DropInfo -------------------------------------------------------
 
 TabStripGtk::DropInfo::DropInfo(int drop_index, bool drop_before,
                                 bool point_down)
     : drop_index(drop_index),
       drop_before(drop_before),
       point_down(point_down) {
   CreateContainer();
   drop_arrow = GetDropArrowImage(point_down);
 }
 
 TabStripGtk::DropInfo::~DropInfo() {
   DestroyContainer();
 }
 
 gboolean TabStripGtk::DropInfo::OnExposeEvent(GtkWidget* widget,
                                               GdkEventExpose* event) {
   if (ui::IsScreenComposited()) {
     SetContainerTransparency();
   } else {
     SetContainerShapeMask();
   }
 
-  gdk_pixbuf_render_to_drawable(drop_arrow,
-                                container->window,
-                                0, 0, 0,
-                                0, 0,
-                                drop_indicator_width,
-                                drop_indicator_height,
-                                GDK_RGB_DITHER_NONE, 0, 0);
+  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
+  gdk_cairo_rectangle(cr, &event->area);
+  cairo_clip(cr);
+
+  drop_arrow->ToCairo()->SetSource(cr, widget, 0, 0);
+  cairo_paint(cr);
+
+  cairo_destroy(cr);
 
   return FALSE;
 }
 
 // Sets the color map of the container window to allow the window to be
 // transparent.
 void TabStripGtk::DropInfo::SetContainerColorMap() {
   GdkScreen* screen = gtk_widget_get_screen(container);
   GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
 
@@ skipping 31 matching lines @@
                                      drop_indicator_width,
                                      drop_indicator_height, 1);
   cairo_t* cairo_context = gdk_cairo_create(GDK_DRAWABLE(pixmap));
 
   // Set the transparency.
   cairo_set_source_rgba(cairo_context, 1, 1, 1, 0);
 
   // Blit the rendered bitmap into a pixmap.  Any pixel set in the pixmap will
   // be opaque in the container window.
   cairo_set_operator(cairo_context, CAIRO_OPERATOR_SOURCE);
-  gdk_cairo_set_source_pixbuf(cairo_context, drop_arrow, 0, 0);
+  // We don't use CairoCachedSurface::SetSource() here because we're not
+  // rendering on a display server.
+  gdk_cairo_set_source_pixbuf(cairo_context, drop_arrow->ToGdkPixbuf(), 0, 0);
   cairo_paint(cairo_context);
   cairo_destroy(cairo_context);
 
   // Set the shape mask.
   gdk_window_shape_combine_mask(container->window, pixmap, 0, 0);
   g_object_unref(pixmap);
 }
 
 void TabStripGtk::DropInfo::CreateContainer() {
   container = gtk_window_new(GTK_WINDOW_POPUP);
@@ skipping 344 matching lines @@
 }
 
 void TabStripGtk::SetNewTabButtonBackground() {
   SkColor color = theme_service_->GetColor(
       ThemeService::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background = theme_service_->GetBitmapNamed(
       IDR_THEME_WINDOW_CONTROL_BACKGROUND);
   SkBitmap* mask = theme_service_->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK);
   newtab_button_->SetBackground(color, background, mask);
 }