Fixes bug in paint scrollbar corner (again)

ui/native_theme/native_theme_aura.cc

 // Copyright (c) 2012 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 "ui/native_theme/native_theme_aura.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/nine_image_painter.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/native_theme/common_theme.h"
 
 using gfx::NineImagePainter;
 
 #define EMPTY_IMAGE_GRID { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 namespace ui {
 
 namespace {
 
@@ skipping 131 matching lines @@
   else
     thumb_rect.Inset(extra_padding, 2, extra_padding, 2);
   PaintPainter(GetOrCreatePainter(
                    kScrollbarThumbImages, state, scrollbar_thumb_painters_),
                sk_canvas, thumb_rect);
 }
 
 void NativeThemeAura::PaintScrollbarCorner(SkCanvas* canvas,
                                            State state,
                                            const gfx::Rect& rect) const {
-  canvas->drawColor(SkColorSetRGB(0xF1, 0xF1, 0xF1), SkXfermode::kSrc_Mode);
+  SkPaint paint;
+  paint.setColor(SkColorSetRGB(0xF1, 0xF1, 0xF1));
+  paint.setStyle(SkPaint::kFill_Style);
+  paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+  canvas->drawIRect(RectToSkIRect(rect), paint);
 }
 
 NineImagePainter* NativeThemeAura::GetOrCreatePainter(
     const int images[kMaxState][9],
     State state,
     scoped_ptr<NineImagePainter> painters[kMaxState]) const {
   if (painters[state])
     return painters[state].get();
   if (images[state][0] == 0) {
     // Must always provide normal state images.
     DCHECK_NE(kNormal, state);
     return GetOrCreatePainter(images, kNormal, painters);
   }
   painters[state] = CreateNineImagePainter(images[state]);
   return painters[state].get();
 }
 
 void NativeThemeAura::PaintPainter(NineImagePainter* painter,
                                    SkCanvas* sk_canvas,
                                    const gfx::Rect& rect) const {
   DCHECK(painter);
   scoped_ptr<gfx::Canvas> canvas(CreateCanvas(sk_canvas));
   painter->Paint(canvas.get(), rect);
 }
 
 }  // namespace ui