GTK: Draw bottom-aligned ntp themes on floating bookmark bar....

chrome/browser/gtk/bookmark_bar_gtk.cc

 // Copyright (c) 2009 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/gtk/bookmark_bar_gtk.h"
 
 #include <vector>
 
+#include "app/gfx/canvas_paint.h"
 #include "app/gfx/text_elider.h"
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/rounded_window.h"
 #include "chrome/browser/gtk/tabstrip_origin_provider.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/ntp_background_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
@@ skipping 965 matching lines @@
 gboolean BookmarkBarGtk::OnEventBoxExpose(GtkWidget* widget,
                                           GdkEventExpose* event,
                                           BookmarkBarGtk* bar) {
   GtkThemeProvider* theme_provider = bar->theme_provider_;
 
   // We don't need to render the toolbar image in GTK mode, except when
   // detached.
   if (theme_provider->UseGtkTheme() && !bar->floating_)
     return FALSE;
 
-  cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
-  cairo_rectangle(cr, event->area.x, event->area.y,
-                  event->area.width, event->area.height);
-  cairo_clip(cr);
+  if (!bar->floating_) {
+    cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
+    cairo_rectangle(cr, event->area.x, event->area.y,
+                    event->area.width, event->area.height);
+    cairo_clip(cr);
 
-  if (!bar->floating_) {
     // Paint the background theme image.
     gfx::Point tabstrip_origin =
         bar->tabstrip_origin_provider_->GetTabStripOriginForWidget(widget);
 
     CairoCachedSurface* background = theme_provider->GetSurfaceNamed(
         IDR_THEME_TOOLBAR, widget);
     background->SetSource(cr, tabstrip_origin.x(), tabstrip_origin.y());
     // We tile the toolbar background in both directions.
     cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
     cairo_rectangle(cr,
         tabstrip_origin.x(),
         tabstrip_origin.y(),
         event->area.x + event->area.width - tabstrip_origin.x(),
         event->area.y + event->area.height - tabstrip_origin.y());
     cairo_fill(cr);
+
+    cairo_destroy(cr);
   } else {
-    // Paint the NTP background. First set the background color.
-    GdkColor bg_color = theme_provider->UseGtkTheme() ? gfx::kGdkWhite :
-        theme_provider->GetGdkColor(BrowserThemeProvider::COLOR_NTP_BACKGROUND);
-    double bg_color_rgb[] = {
-        static_cast<double>(bg_color.red / 257) / 255.0,
-        static_cast<double>(bg_color.green / 257) / 255.0,
-        static_cast<double>(bg_color.blue / 257) / 255.0, };
-    cairo_set_source_rgb(cr, bg_color_rgb[0], bg_color_rgb[1], bg_color_rgb[2]);
-    cairo_rectangle(cr,
-        event->area.x,
-        event->area.y,
-        event->area.width,
-        event->area.height);
-    cairo_fill(cr);
-
-    // Now paint the image, if it exists.
-    // TODO(estade): handle different alignments.
-    if (theme_provider->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
-      CairoCachedSurface* background = theme_provider->GetSurfaceNamed(
-          IDR_THEME_NTP_BACKGROUND, widget);
-      background->SetSource(cr, widget->allocation.x, widget->allocation.y);
-      cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
-      cairo_rectangle(cr,
-          event->area.x,
-          event->area.y,
-          event->area.width,
-          event->area.height);
-      cairo_fill(cr);
+    gfx::Size tab_contents_size;
+    Browser* browser = bar->browser_;
+    if (!browser) {
+      NOTREACHED();
+      return FALSE;
     }
+    TabContents* tab_contents = browser->GetSelectedTabContents();
+    if (!tab_contents) {
+      NOTREACHED();
+      return FALSE;
+    }
+    if (!tab_contents->view()) {
+      NOTREACHED();
+      return FALSE;
+    }
+    tab_contents_size = tab_contents->view()->GetContainerSize();
+    gfx::CanvasPaint canvas(event, true);
+    NtpBackgroundUtil::PaintBackgroundDetachedMode(theme_provider, &canvas,
+        gfx::Rect(widget->allocation), tab_contents_size.height());
   }
 
-  cairo_destroy(cr);
-
   return FALSE;  // Propagate expose to children.
 }
 
 // static
 gboolean BookmarkBarGtk::OnSeparatorExpose(GtkWidget* widget,
                                            GdkEventExpose* event,
                                            BookmarkBarGtk* bar) {
   if (bar->theme_provider_->UseGtkTheme())
     return FALSE;
 
@@ skipping 91 matching lines @@
       break;
     }
   }
   DCHECK_NE(button_idx, -1);
 
   // Find the GtkWidget* for the actual target button.
   int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1;
   button_idx = (button_idx + shift + folder_list.size()) % folder_list.size();
   PopupForButton(folder_list[button_idx]);
 }