Add Icon Support for New Autofill Gtk UI

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_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/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 89 matching lines @@
 
 // Return a Rect for the space for a result line.  This excludes the border,
 // but includes the padding.  This is the area that is colored for a selection.
 gfx::Rect GetRectForLine(size_t line, int width) {
   return gfx::Rect(kBorderThickness,
                    (line * kHeightPerResult) + kBorderThickness,
                    width - (kBorderThickness * 2),
                    kHeightPerResult);
 }
 
-// Helper for drawing an entire pixbuf without dithering.
-void DrawFullImage(cairo_t* cr, GtkWidget* widget, const gfx::Image* image,
-                   gint dest_x, gint dest_y) {
-  gfx::CairoCachedSurface* surface = image->ToCairo();
-  surface->SetSource(cr, widget, dest_x, dest_y);
-  cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
-  cairo_rectangle(cr, dest_x, dest_y, surface->Width(), surface->Height());
-  cairo_fill(cr);
-}
-
 // TODO(deanm): Find some better home for this, and make it more efficient.
 size_t GetUTF8Offset(const string16& text, size_t text_offset) {
   return UTF16ToUTF8(text.substr(0, text_offset)).length();
 }
 
 // Generates the normal URL color, a green color used in unhighlighted URL
 // text. It is a mix of |kURLTextColor| and the current text color.  Unlike the
 // selected text color, it is more important to match the qualities of the
 // foreground typeface color instead of taking the background into account.
 GdkColor NormalURLColor(GdkColor foreground) {
@@ skipping 525 matching lines @@
                                  &hovered_background_color_);
       // This entry is selected or hovered, fill a rect with the color.
       cairo_rectangle(cr, line_rect.x(), line_rect.y(),
                       line_rect.width(), line_rect.height());
       cairo_fill(cr);
     }
 
     int icon_start_x = ltr ? kIconLeftPadding :
         (line_rect.width() - kIconLeftPadding - kIconWidth);
     // Draw the icon for this result.
-    DrawFullImage(cr, widget,
-                  IconForMatch(*match, is_selected, is_selected_keyword),
-                  icon_start_x, line_rect.y() + kIconTopPadding);
+    gtk_util::DrawFullImage(cr, widget,
+                            IconForMatch(*match, is_selected,
+                                         is_selected_keyword),
+                            icon_start_x, line_rect.y() + kIconTopPadding);
 
     // Draw the results text vertically centered in the results space.
     // First draw the contents / url, but don't let it take up the whole width
     // if there is also a description to be shown.
     bool has_description = !match->description.empty();
     int text_width = window_rect.width() - (kIconAreaWidth + kRightPadding);
     int allocated_content_width = has_description ?
         static_cast<int>(text_width * kContentWidthPercentage) : text_width;
     pango_layout_set_width(layout_, allocated_content_width * PANGO_SCALE);
 
@@ skipping 53 matching lines @@
       pango_cairo_show_layout(cr, layout_);
       cairo_restore(cr);
     }
 
     if (match->associated_keyword.get()) {
       // If this entry has an associated keyword, draw the arrow at the extreme
       // other side of the omnibox.
       icon_start_x = ltr ? (line_rect.width() - kIconLeftPadding - kIconWidth) :
           kIconLeftPadding;
       // Draw the icon for this result.
-      DrawFullImage(cr, widget,
-                    theme_service_->GetImageNamed(
-                        is_selected ? IDR_OMNIBOX_TTS_DARK : IDR_OMNIBOX_TTS),
-                    icon_start_x, line_rect.y() + kIconTopPadding);
+      gtk_util::DrawFullImage(cr, widget,
+                              theme_service_->GetImageNamed(
+                                  is_selected ? IDR_OMNIBOX_TTS_DARK :
+                                  IDR_OMNIBOX_TTS),
+                              icon_start_x, line_rect.y() + kIconTopPadding);
     }
   }
 
   cairo_destroy(cr);
   return TRUE;
 }