Revert 112839 (it probably caused http://crbug.com/106299 ) - GTK: Port omnibox drawing from GdkG...

chrome/browser/ui/gtk/omnibox/omnibox_popup_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/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_windowing.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xc7, 0xca, 0xce);
 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff);
 const GdkColor kSelectedBackgroundColor = GDK_COLOR_RGB(0xdf, 0xe6, 0xf6);
 const GdkColor kHoveredBackgroundColor = GDK_COLOR_RGB(0xef, 0xf2, 0xfa);
 
@@ skipping 50 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);
+void DrawFullPixbuf(GdkDrawable* drawable, GdkGC* gc, GdkPixbuf* pixbuf,
+                    gint dest_x, gint dest_y) {
+  gdk_draw_pixbuf(drawable, gc, pixbuf,
+                  0, 0,                        // Source.
+                  dest_x, dest_y,              // Dest.
+                  -1, -1,                      // Width/height (auto).
+                  GDK_RGB_DITHER_NONE, 0, 0);  // Don't dither.
 }
 
 // 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
@@ skipping 207 matching lines @@
 }
 
 OmniboxPopupViewGtk::~OmniboxPopupViewGtk() {
   // Explicitly destroy our model here, before we destroy our GTK widgets.
   // This is because the model destructor can call back into us, and we need
   // to make sure everything is still valid when it does.
   model_.reset();
   g_object_unref(layout_);
   gtk_widget_destroy(window_);
 
-  for (ImageMap::iterator it = images_.begin(); it != images_.end(); ++it)
-    delete it->second;
+  for (PixbufMap::iterator it = pixbufs_.begin(); it != pixbufs_.end(); ++it)
+    g_object_unref(it->second);
 }
 
 bool OmniboxPopupViewGtk::IsOpen() const {
   return opened_;
 }
 
 void OmniboxPopupViewGtk::InvalidateLine(size_t line) {
   // TODO(deanm): Is it possible to use some constant for the width, instead
   // of having to query the width of the window?
   GdkRectangle line_rect = GetRectForLine(
@@ skipping 123 matching lines @@
   // OpenMatch() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant match out to
   // make sure it stays alive until the call completes.
   AutocompleteMatch match = model_->result().match_at(line);
   string16 keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   omnibox_view_->OpenMatch(match, disposition, GURL(), line,
                            is_keyword_hint ? string16() : keyword);
 }
 
-const gfx::Image* OmniboxPopupViewGtk::IconForMatch(
-    const AutocompleteMatch& match, bool selected) {
+GdkPixbuf* OmniboxPopupViewGtk::IconForMatch(const AutocompleteMatch& match,
+                                             bool selected) {
   const SkBitmap* bitmap = model_->GetIconIfExtensionMatch(match);
   if (bitmap) {
-    if (!ContainsKey(images_, bitmap))
-      images_[bitmap] = new gfx::Image(bitmap);
-    return images_[bitmap];
+    if (!ContainsKey(pixbufs_, bitmap))
+      pixbufs_[bitmap] = gfx::GdkPixbufFromSkBitmap(bitmap);
+    return pixbufs_[bitmap];
   }
 
   int icon = match.starred ?
       IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
   if (selected) {
     switch (icon) {
       case IDR_OMNIBOX_EXTENSION_APP:
         icon = IDR_OMNIBOX_EXTENSION_APP_DARK;
         break;
       case IDR_OMNIBOX_HTTP:
         icon = IDR_OMNIBOX_HTTP_DARK;
         break;
       case IDR_OMNIBOX_HISTORY:
         icon = IDR_OMNIBOX_HISTORY_DARK;
         break;
       case IDR_OMNIBOX_SEARCH:
         icon = IDR_OMNIBOX_SEARCH_DARK;
         break;
       case IDR_OMNIBOX_STAR:
         icon = IDR_OMNIBOX_STAR_DARK;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
-  return theme_service_->GetImageNamed(icon);
+  // TODO(estade): Do we want to flip these for RTL?  (Windows doesn't).
+  return theme_service_->GetPixbufNamed(icon);
 }
 
 gboolean OmniboxPopupViewGtk::HandleMotion(GtkWidget* widget,
                                            GdkEventMotion* event) {
   // TODO(deanm): Windows has a bunch of complicated logic here.
   size_t line = LineFromY(static_cast<int>(event->y));
   // There is both a hovered and selected line, hovered just means your mouse
   // is over it, but selected is what's showing in the location edit.
   model_->SetHoveredLine(line);
   // Select the line if the user has the left mouse button down.
@@ skipping 44 matching lines @@
   gfx::Rect window_rect = GetWindowRect(event->window);
   gfx::Rect damage_rect = gfx::Rect(event->area);
   // Handle when our window is super narrow.  A bunch of the calculations
   // below would go negative, and really we're not going to fit anything
   // useful in such a small window anyway.  Just don't paint anything.
   // This means we won't draw the border, but, yeah, whatever.
   // TODO(deanm): Make the code more robust and remove this check.
   if (window_rect.width() < (kIconAreaWidth * 3))
     return TRUE;
 
-  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
-  gdk_cairo_rectangle(cr, &event->area);
-  cairo_clip(cr);
+  GdkDrawable* drawable = GDK_DRAWABLE(event->window);
+  GdkGC* gc = gdk_gc_new(drawable);
+
+  // kBorderColor is unallocated, so use the GdkRGB routine.
+  gdk_gc_set_rgb_fg_color(gc, &border_color_);
 
   // This assert is kinda ugly, but it would be more currently unneeded work
   // to support painting a border that isn't 1 pixel thick.  There is no point
   // in writing that code now, and explode if that day ever comes.
   COMPILE_ASSERT(kBorderThickness == 1, border_1px_implied);
   // Draw the 1px border around the entire window.
-  gdk_cairo_set_source_color(cr, &border_color_);
-  cairo_rectangle(cr, 0, 0, window_rect.width(), window_rect.height());
-  cairo_stroke(cr);
+  gdk_draw_rectangle(drawable, gc, FALSE,
+                     0, 0,
+                     window_rect.width() - 1, window_rect.height() - 1);
 
   pango_layout_set_height(layout_, kHeightPerResult * PANGO_SCALE);
 
   for (size_t i = 0; i < result.size(); ++i) {
     gfx::Rect line_rect = GetRectForLine(i, window_rect.width());
     // Only repaint and layout damaged lines.
     if (!line_rect.Intersects(damage_rect))
       continue;
 
     const AutocompleteMatch& match = result.match_at(i);
     bool is_selected = (model_->selected_line() == i);
     bool is_hovered = (model_->hovered_line() == i);
     if (is_selected || is_hovered) {
-      gdk_cairo_set_source_color(cr, is_selected ? &selected_background_color_ :
-                                 &hovered_background_color_);
+      gdk_gc_set_rgb_fg_color(gc, is_selected ? &selected_background_color_ :
+                              &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);
+      gdk_draw_rectangle(drawable, gc, TRUE,
+                         line_rect.x(), line_rect.y(),
+                         line_rect.width(), line_rect.height());
     }
 
     int icon_start_x = ltr ? kIconLeftPadding :
         (line_rect.width() - kIconLeftPadding - kIconWidth);
     // Draw the icon for this result.
-    DrawFullImage(cr, widget,
-                  IconForMatch(match, is_selected),
-                  icon_start_x, line_rect.y() + kIconTopPadding);
+    DrawFullPixbuf(drawable, gc,
+                   IconForMatch(match, is_selected),
+                   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 11 matching lines @@
     pango_layout_get_size(layout_,
         &actual_content_width, &actual_content_height);
     actual_content_width /= PANGO_SCALE;
     actual_content_height /= PANGO_SCALE;
 
     // DCHECK_LT(actual_content_height, kHeightPerResult);  // Font is too tall.
     // Center the text within the line.
     int content_y = std::max(line_rect.y(),
         line_rect.y() + ((kHeightPerResult - actual_content_height) / 2));
 
-    cairo_save(cr);
-    cairo_move_to(cr,
-                  ltr ? kIconAreaWidth :
+    gdk_draw_layout(drawable, gc,
+                    ltr ? kIconAreaWidth :
                         (text_width - actual_content_width),
-                  content_y);
-    pango_cairo_show_layout(cr, layout_);
-    cairo_restore(cr);
+                    content_y, layout_);
 
     if (has_description) {
       pango_layout_set_width(layout_,
           (text_width - actual_content_width) * PANGO_SCALE);
 
       // In Windows, a boolean "force_dim" is passed as true for the
       // description.  Here, we pass the dim text color for both normal and dim,
       // to accomplish the same thing.
       SetupLayoutForMatch(layout_, match.description, match.description_class,
                           is_selected ? &selected_content_dim_text_color_ :
                               &content_dim_text_color_,
                           is_selected ? &selected_content_dim_text_color_ :
                               &content_dim_text_color_,
                           is_selected ? &url_selected_text_color_ :
                               &url_text_color_,
                           std::string(" - "));
       gint actual_description_width;
       pango_layout_get_size(layout_, &actual_description_width, NULL);
-
-      cairo_save(cr);
-      cairo_move_to(cr, ltr ?
-                    (kIconAreaWidth + actual_content_width) :
-                    (text_width - actual_content_width -
-                     (actual_description_width / PANGO_SCALE)),
-                    content_y);
-      pango_cairo_show_layout(cr, layout_);
-      cairo_restore(cr);
+      gdk_draw_layout(drawable, gc, ltr ?
+                          (kIconAreaWidth + actual_content_width) :
+                          (text_width - actual_content_width -
+                           (actual_description_width / PANGO_SCALE)),
+                      content_y, layout_);
     }
   }
 
-  cairo_destroy(cr);
+  g_object_unref(gc);
+
   return TRUE;
 }