Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend

webkit/plugins/ppapi/ppb_image_data_impl.h

 // Copyright (c) 2012 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 WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
-namespace skia {
-class PlatformCanvas;
-}
-
 class SkBitmap;
+class SkCanvas;
 
 namespace webkit {
 namespace ppapi {
 
 class WEBKIT_PLUGINS_EXPORT PPB_ImageData_Impl
     : public ::ppapi::Resource,
       public ::ppapi::PPB_ImageData_Shared,
       public NON_EXPORTED_BASE(::ppapi::thunk::PPB_ImageData_API) {
  public:
   // We delegate most of our implementation to a back-end class that either uses
   // a PlatformCanvas (for most trusted stuff) or bare shared memory (for use by
   // NaCl). This makes it cheap & easy to implement Swap.
   class Backend {
    public:
     virtual ~Backend() {};
     virtual bool Init(PPB_ImageData_Impl* impl, PP_ImageDataFormat format,
                       int width, int height, bool init_to_zero) = 0;
     virtual bool IsMapped() const = 0;
     virtual PluginDelegate::PlatformImage2D* PlatformImage() const = 0;
     virtual void* Map() = 0;
     virtual void Unmap() = 0;
     virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) = 0;
-    virtual skia::PlatformCanvas* GetPlatformCanvas() = 0;
+    virtual SkCanvas* GetPlatformCanvas() = 0;
     virtual SkCanvas* GetCanvas() = 0;
     virtual const SkBitmap* GetMappedBitmap() const = 0;
   };
 
   // If you call this constructor, you must also call Init before use. Normally
   // you should use the static Create function, but this constructor is needed
   // for some internal uses of ImageData (like Graphics2D).
   enum ImageDataType { PLATFORM, NACL };
   PPB_ImageData_Impl(PP_Instance instance, ImageDataType type);
   virtual ~PPB_ImageData_Impl();
@@ skipping 29 matching lines @@
   PluginDelegate::PlatformImage2D* PlatformImage() const;
 
   // Resource override.
   virtual ::ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() OVERRIDE;
 
   // PPB_ImageData_API implementation.
   virtual PP_Bool Describe(PP_ImageDataDesc* desc) OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
-  virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+  virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
   virtual SkCanvas* GetCanvas() OVERRIDE;
 
   const SkBitmap* GetMappedBitmap() const;
 
  private:
   PP_ImageDataFormat format_;
   int width_;
   int height_;
   scoped_ptr<Backend> backend_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Impl);
 };
 
 class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend {
  public:
   ImageDataPlatformBackend();
   virtual ~ImageDataPlatformBackend();
 
   // PPB_ImageData_Impl::Backend implementation.
   virtual bool Init(PPB_ImageData_Impl* impl, PP_ImageDataFormat format,
                     int width, int height, bool init_to_zero) OVERRIDE;
   virtual bool IsMapped() const OVERRIDE;
   virtual PluginDelegate::PlatformImage2D* PlatformImage() const OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
-  virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+  virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
   virtual SkCanvas* GetCanvas() OVERRIDE;
   virtual const SkBitmap* GetMappedBitmap() const OVERRIDE;
 
  private:
   // This will be NULL before initialization, and if this PPB_ImageData_Impl is
   // swapped with another.
   scoped_ptr<PluginDelegate::PlatformImage2D> platform_image_;
 
   // When the device is mapped, this is the image. Null when umapped.
-  scoped_ptr<skia::PlatformCanvas> mapped_canvas_;
+  scoped_ptr<SkCanvas> mapped_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataPlatformBackend);
 };
 
 class ImageDataNaClBackend : public PPB_ImageData_Impl::Backend {
  public:
   ImageDataNaClBackend();
   virtual ~ImageDataNaClBackend();
 
   // PPB_ImageData_Impl::Backend implementation.
   bool Init(PPB_ImageData_Impl* impl, PP_ImageDataFormat format,
             int width, int height, bool init_to_zero) OVERRIDE;
   virtual bool IsMapped() const OVERRIDE;
   PluginDelegate::PlatformImage2D* PlatformImage() const OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
-  virtual skia::PlatformCanvas* GetPlatformCanvas() OVERRIDE;
+  virtual SkCanvas* GetPlatformCanvas() OVERRIDE;
   virtual SkCanvas* GetCanvas() OVERRIDE;
   virtual const SkBitmap* GetMappedBitmap() const OVERRIDE;
 
  private:
   scoped_ptr<base::SharedMemory> shared_memory_;
   // skia_bitmap_ is backed by shared_memory_.
   SkBitmap skia_bitmap_;
   scoped_ptr<SkCanvas> skia_canvas_;
   uint32 map_count_;
 
@@ skipping 36 matching lines @@
   bool is_valid_;
   bool needs_unmap_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataAutoMapper);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_