linux: offset toolbar graphic so tabs merge in properly.

chrome/browser/gtk/nine_box.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/nine_box.h"
 
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/logging.h"
 
@@ skipping 50 matching lines @@
   const int x1 = gdk_pixbuf_get_width(images[0]);
   const int y1 = gdk_pixbuf_get_height(images[0]);
   const int x2 = images[2] ? dst_width - gdk_pixbuf_get_width(images[2]) : x1;
   const int y2 = images[6] ? dst_height - gdk_pixbuf_get_height(images[6]) : y1;
   DCHECK(x2 >= x1);
   DCHECK(y2 >= y1);
 
   if (images[0])
     DrawPixbuf(dst, images[0], 0, 0);
   if (images[1])
-    RenderTopCenterStrip(dst, x1, x2);
+    RenderTopCenterStrip(dst, x1, x2, 0);
   if (images[2])
     DrawPixbuf(dst, images[2], x2, 0);
 
   // Center row.  Needs vertical tiling.
   images = &images_[1 * 3];
   if (images[0]) {
     TileImage(dst, images[0],
               0, y1,
               0, y2);
   }
@@ skipping 17 matching lines @@
     DrawPixbuf(dst, images[0], 0, y2);
   if (images[1]) {
     TileImage(dst, images[1],
               x1, y2,
               x2, y2);
   }
   if (images[2])
     DrawPixbuf(dst, images[2], x2, y2);
 }
 
-void NineBox::RenderTopCenterStrip(GtkWidget* dst, int x1, int x2) {
+void NineBox::RenderTopCenterStrip(GtkWidget* dst, int x1, int x2, int y1) {
   TileImage(dst, images_[1],
-            x1, 0,
-            x2, 0);
+            x1, y1,
+            x2, y1);
 }
 
 void NineBox::TileImage(GtkWidget* dst, GdkPixbuf* src,
                         int x1, int y1, int x2, int y2) {
   GdkGC* gc = dst->style->fg_gc[GTK_WIDGET_STATE(dst)];
   const int src_width = gdk_pixbuf_get_width(src);
   const int src_height = gdk_pixbuf_get_height(src);
   const int dst_width = dst->allocation.width;
   const int dst_height = dst->allocation.height;
 
   gfx::Point offset = GetWindowRelativeCoords(dst);
 
   // We only tile along one axis (see above TODO about nuking all this code),
   // dx or dy will be nonzero along that axis.
   int dx = 0, dy = 0;
   if (x2 > x1)
     dx = src_width;
   if (y2 > y1)
     dy = src_height;
   DCHECK(dx == 0 || dy == 0);
 
   for (int x = x1, y = y1; x < x2 || y < y2; x += dx, y += dy) {
     gdk_draw_pixbuf(dst->window, gc, src, 0, 0,
                     offset.x() + x, offset.y() + y,
                     dx ? std::min(src_width,  dst_width - x) : src_width,
                     dy ? std::min(src_height, dst_height - y) : src_height,
                     GDK_RGB_DITHER_NONE, 0, 0);
   }
 }