Reimplement NineBox using Cairo.

- Fixes a bug we've had for a long time drawing the wrench button.  We would
  over-tile the center portion, and draw the right images on top of it.
- Move away from x1 .. x2 parameters to more clear width and height.
- Makes the code significantly more straightforward and efficient.

Review URL: http://codereview.chromium.org/115181


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15755 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 5 deletions

diff --git a/chrome/browser/gtk/nine_box.h b/chrome/browser/gtk/nine_box.h
index 950a359..4a23bb0 100644
--- a/chrome/browser/gtk/nine_box.h
+++ b/chrome/browser/gtk/nine_box.h
@@ -30,9 +30,9 @@ class NineBox {
   // The images will be tiled to fit into the widget.
   void RenderToWidget(GtkWidget* dst) const;
 
-  // Render the top row of images to |dst| between |x1| and |x2|.
+  // Render the top row of images to |dst| between |x1| and |x1| + |width|.
   // This is split from RenderToWidget so the toolbar can use it.
-  void RenderTopCenterStrip(GtkWidget* dst, int x1, int x2, int y1) const;
+  void RenderTopCenterStrip(cairo_t* cr, int x, int y, int width) const;
 
   // Change all pixels that are white in |images_| to have 0 opacity.
   void ChangeWhiteToTransparent();
@@ -45,9 +45,6 @@ class NineBox {
   void ContourWidget(GtkWidget* widget) const;
 
  private:
-  // Repeatedly stamp src across dst.
-  void TileImage(GtkWidget* dst, GdkPixbuf* src,
-                 int x1, int y1, int x2, int y2) const;
 
   GdkPixbuf* images_[9];
 };