Removing GraphicsContext from ImageBuffer

Source/platform/scroll/ScrollbarThemeMacCommon.mm

Index: Source/platform/scroll/ScrollbarThemeMacCommon.mm
diff --git a/Source/platform/scroll/ScrollbarThemeMacCommon.mm b/Source/platform/scroll/ScrollbarThemeMacCommon.mm
index efca048f10662bc8a919c6da6e984e2210036814..40a8c8721ebe3f59f9f3add4747ffba5c0de08ba 100644
--- a/Source/platform/scroll/ScrollbarThemeMacCommon.mm
+++ b/Source/platform/scroll/ScrollbarThemeMacCommon.mm
@@ -98,7 +98,7 @@ void ScrollbarThemeMacCommon::unregisterScrollbar(ScrollbarThemeClient* scrollba
     scrollbarSet().remove(scrollbar);
 }
 
-void ScrollbarThemeMacCommon::paintGivenTickmarks(GraphicsContext* context, ScrollbarThemeClient* scrollbar, const IntRect& rect, const Vector<IntRect>& tickmarks)
+void ScrollbarThemeMacCommon::paintGivenTickmarks(SkCanvas* canvas, ScrollbarThemeClient* scrollbar, const IntRect& rect, const Vector<IntRect>& tickmarks)
 {
     if (scrollbar->orientation() != VerticalScrollbar)
         return;
@@ -109,10 +109,17 @@ void ScrollbarThemeMacCommon::paintGivenTickmarks(GraphicsContext* context, Scro
     if (!tickmarks.size())
         return;
 
-    GraphicsContextStateSaver stateSaver(*context);
-    context->setShouldAntialias(false);
-    context->setStrokeColor(Color(0xCC, 0xAA, 0x00, 0xFF));
-    context->setFillColor(Color(0xFF, 0xDD, 0x00, 0xFF));
+    SkAutoCanvasRestore stateSaver(canvas, true);
+
+    SkPaint strokePaint;
+    strokePaint.setAntiAlias(false);
+    strokePaint.setColor(SkColorSetRGB(0xCC, 0xAA, 0x00));
+    strokePaint.setStyle(SkPaint::kStroke_Style);
+
+    SkPaint fillPaint;
+    fillPaint.setAntiAlias(false);
+    fillPaint.setColor(SkColorSetRGB(0xFF, 0xDD, 0x00));
+    fillPaint.setStyle(SkPaint::kFill_Style);
 
     for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
         // Calculate how far down (in %) the tick-mark should appear.
@@ -125,8 +132,8 @@ void ScrollbarThemeMacCommon::paintGivenTickmarks(GraphicsContext* context, Scro
 
         // Paint.
         FloatRect tickRect(rect.x(), yPos, rect.width(), 2);
-        context->fillRect(tickRect);
-        context->strokeRect(tickRect, 1);
+        canvas->drawRect(tickRect, fillPaint);
+        canvas->drawRect(tickRect, strokePaint);
     }
 }
 
@@ -152,7 +159,7 @@ void ScrollbarThemeMacCommon::paintTickmarks(GraphicsContext* context, Scrollbar
     IntRect tickmarkTrackRect = rect;
     tickmarkTrackRect.setX(tickmarkTrackRect.x() + 1);
     tickmarkTrackRect.setWidth(tickmarkTrackRect.width() - 2);
-    paintGivenTickmarks(context, scrollbar, tickmarkTrackRect, tickmarks);
+    paintGivenTickmarks(context->canvas(), scrollbar, tickmarkTrackRect, tickmarks);
 }
 
 ScrollbarThemeMacCommon::~ScrollbarThemeMacCommon()