keep only one typedef for the native drawing context

skia/ext/platform_canvas.h

Index: skia/ext/platform_canvas.h
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index 452a575cc86887b34edebe44662e5e1a791ee240..7496ef3767785bba19e355f725f7df11a8215c6b 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -130,22 +130,24 @@ SK_API bool GetWritablePixels(SkCanvas* canvas, SkPixmap* pixmap);
 
 // Returns true if native platform routines can be used to draw on the
 // given canvas. If this function returns false,
-// ScopedPlatformPaint::GetPlatformSurface() should return NULL.
+// ScopedPlatformPaint::GetNativeDrawingContext() should return NULL.
 SK_API bool SupportsPlatformPaint(const SkCanvas* canvas);
 
 // This object guards calls to platform drawing routines. The surface
-// returned from GetPlatformSurface() can be used with the native platform
+// returned from GetNativeDrawingContext() can be used with the native platform
 // routines.
 class SK_API ScopedPlatformPaint {
  public:
   explicit ScopedPlatformPaint(SkCanvas* canvas);
 
-  // Returns the PlatformSurface to use for native platform drawing calls.
-  PlatformSurface GetPlatformSurface() { return platform_surface_; }
+  // Returns the NativeDrawingContext to use for native platform drawing calls.
+  NativeDrawingContext GetNativeDrawingContext() {
+    return native_drawing_context_;
+  }
 
  private:
   SkCanvas* canvas_;
-  PlatformSurface platform_surface_;
+  NativeDrawingContext native_drawing_context_;
 
   // Disallow copy and assign
   ScopedPlatformPaint(const ScopedPlatformPaint&);