Add PlatformPictureSkia and RecordingPlatformDeviceSkia.

ui/gfx/blit.cc

Index: ui/gfx/blit.cc
diff --git a/ui/gfx/blit.cc b/ui/gfx/blit.cc
index 25d0ebedd455d165079deda78fea6df25a011bf3..8445825499c21a076b138dbc00c86046bb9a60f5 100644
--- a/ui/gfx/blit.cc
+++ b/ui/gfx/blit.cc
@@ -98,7 +98,7 @@ void BlitContextToCanvas(SkCanvas *dst_canvas,
                          const Rect& dst_rect,
                          NativeDrawingContext src_context,
                          const Point& src_origin) {
-  DCHECK(skia::SupportsPlatformPaint(dst_canvas));
+  DCHECK(skia::PlatformPaintSupport(dst_canvas));
   BlitContextToContext(skia::BeginPlatformPaint(dst_canvas), dst_rect,
                        src_context, src_origin);
   skia::EndPlatformPaint(dst_canvas);
@@ -108,7 +108,7 @@ void BlitCanvasToContext(NativeDrawingContext dst_context,
                          const Rect& dst_rect,
                          SkCanvas *src_canvas,
                          const Point& src_origin) {
-  DCHECK(skia::SupportsPlatformPaint(src_canvas));
+  DCHECK(skia::PlatformPaintSupport(src_canvas));
   BlitContextToContext(dst_context, dst_rect,
                        skia::BeginPlatformPaint(src_canvas), src_origin);
   skia::EndPlatformPaint(src_canvas);
@@ -118,8 +118,8 @@ void BlitCanvasToCanvas(SkCanvas *dst_canvas,
                         const Rect& dst_rect,
                         SkCanvas *src_canvas,
                         const Point& src_origin) {
-  DCHECK(skia::SupportsPlatformPaint(dst_canvas));
-  DCHECK(skia::SupportsPlatformPaint(src_canvas));
+  DCHECK(skia::PlatformPaintSupport(dst_canvas));
+  DCHECK(skia::PlatformPaintSupport(src_canvas));
   BlitContextToContext(skia::BeginPlatformPaint(dst_canvas), dst_rect,
                        skia::BeginPlatformPaint(src_canvas), src_origin);
   skia::EndPlatformPaint(src_canvas);
@@ -133,7 +133,8 @@ void ScrollCanvas(SkCanvas* canvas,
 #if defined(OS_WIN)
   // If we have a PlatformCanvas, we should use ScrollDC. Otherwise, fall
   // through to the software implementation.
-  if (skia::SupportsPlatformPaint(canvas)) {
+  if (skia::PlatformPaintSupport(canvas) ==
+      skia::PlatformDevice::PLATFORM_PAINT_DIRECT) {
     skia::ScopedPlatformPaint scoped_platform_paint(canvas);
     HDC hdc = scoped_platform_paint.GetPlatformSurface();