Removal of dependencies on PlatformDevice classes.

skia/ext/platform_canvas_linux.cc

Index: skia/ext/platform_canvas_linux.cc
===================================================================
--- skia/ext/platform_canvas_linux.cc	(revision 85672)
+++ skia/ext/platform_canvas_linux.cc	(working copy)
@@ -6,8 +6,8 @@
 
 #include <cairo/cairo.h>
 
-#include "skia/ext/platform_device_linux.h"
-#include "skia/ext/bitmap_platform_device_linux.h"
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
@@ -33,12 +33,12 @@
       width, height, is_opaque, data));
 }
 
-cairo_t* PlatformCanvas::beginPlatformPaint() const {
-  return getTopPlatformDevice().BeginPlatformPaint();
+platform_util::PlatformSurface PlatformCanvas::beginPlatformPaint() const {
+  return platform_util::BeginPlatformPaint(&getTopDevice());
 }
 
 void PlatformCanvas::endPlatformPaint() const {
-  getTopPlatformDevice().EndPlatformPaint();
+  platform_util::BeginPlatformPaint(&getTopDevice());
 }
 
 }  // namespace skia