keep only one typedef for the native drawing context

skia/ext/platform_canvas.h

 // Copyright (c) 2011 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.
 
 #ifndef SKIA_EXT_PLATFORM_CANVAS_H_
 #define SKIA_EXT_PLATFORM_CANVAS_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 // The platform-specific device will include the necessary platform headers
 // to get the surface type.
 #include "build/build_config.h"
-#include "skia/ext/platform_surface.h"
+#include "skia/ext/native_drawing_context.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 
 class SkBaseDevice;
 
 // A PlatformCanvas is a software-rasterized SkCanvas which is *also*
 // addressable by the platform-specific drawing API (GDI, Core Graphics,
 // Cairo...).
@@ skipping 98 matching lines @@
 // canvas. All writes to the pixmap should be visible if the canvas is
 // raster-backed.
 //
 // Returns false on failure: if either argument is nullptr, or if the
 // pixels can not be retrieved from the canvas. In the latter case resets
 // the pixmap to empty.
 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&);
   ScopedPlatformPaint& operator=(const ScopedPlatformPaint&);
 };
 
 // Following routines are used in print preview workflow to mark the
 // preview metafile.
 SK_API SkMetaData& GetMetaData(const SkCanvas& canvas);
 
 #if defined(OS_MACOSX)
 SK_API void SetIsPreviewMetafile(const SkCanvas& canvas, bool is_preview);
 SK_API bool IsPreviewMetafile(const SkCanvas& canvas);
 
 // Returns the CGContext that backing the SkCanvas.
 // Returns NULL if none is bound.
 SK_API CGContextRef GetBitmapContext(const SkCanvas& canvas);
 #endif
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_CANVAS_H_