Revert 111288 - Possibly broke media_unittests on Mac

chrome/browser/ui/gtk/gtk_theme_service.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/gtk_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
@@ skipping 1054 matching lines @@
     SkColor lighter = gradient_top_color ? GdkToSkColor(gradient_top_color)
                       : color_utils::HSLShift(base, kGtkFrameShift);
     SkShader* shader = gfx::CreateGradientShader(
         0, gradient_size, lighter, base);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
     paint.setShader(shader);
     shader->unref();
 
-    canvas.DrawRect(gfx::Rect(0, 0, kToolbarImageWidth, gradient_size), paint);
+    canvas.DrawRectInt(0, 0, kToolbarImageWidth, gradient_size, paint);
   }
 
-  canvas.FillRect(base, gfx::Rect(0, gradient_size, kToolbarImageWidth,
+  canvas.FillRect(base, gfx::Rect(0, gradient_size,
+                                  kToolbarImageWidth,
                                   kToolbarImageHeight - gradient_size));
   return new SkBitmap(canvas.ExtractBitmap());
 }
 
 SkBitmap* GtkThemeService::GenerateTabImage(int base_id) const {
   SkBitmap* base_image = GetBitmapNamed(base_id);
   SkBitmap bg_tint = SkBitmapOperations::CreateHSLShiftedBitmap(
       *base_image, GetTint(ThemeService::TINT_BACKGROUND_TAB));
   return new SkBitmap(SkBitmapOperations::CreateTiledBitmap(
       bg_tint, 0, 0, bg_tint.width(), bg_tint.height()));
@@ skipping 148 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                 widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }