Move webkit/plugins/ppapi to content/renderer/pepper.

content/renderer/pepper/ppb_image_data_impl.h

Index: content/renderer/pepper/ppb_image_data_impl.h
===================================================================
--- content/renderer/pepper/ppb_image_data_impl.h	(revision 213482)
+++ content/renderer/pepper/ppb_image_data_impl.h	(working copy)
@@ -2,18 +2,18 @@
 // 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_
+#ifndef CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
+#define CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/common/content_export.h"
+#include "content/renderer/pepper/plugin_delegate.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"
 
 class SkBitmap;
 class SkCanvas;
@@ -21,7 +21,7 @@
 namespace webkit {
 namespace ppapi {
 
-class WEBKIT_PLUGINS_EXPORT PPB_ImageData_Impl
+class CONTENT_EXPORT PPB_ImageData_Impl
     : public ::ppapi::Resource,
       public ::ppapi::PPB_ImageData_Shared,
       public NON_EXPORTED_BASE(::ppapi::thunk::PPB_ImageData_API) {
@@ -50,7 +50,6 @@
   // for some internal uses of ImageData (like Graphics2D).
   PPB_ImageData_Impl(PP_Instance instance,
                      PPB_ImageData_Shared::ImageDataType type);
-  virtual ~PPB_ImageData_Impl();
 
   bool Init(PP_ImageDataFormat format,
             int width, int height,
@@ -88,6 +87,8 @@
   const SkBitmap* GetMappedBitmap() const;
 
  private:
+  virtual ~PPB_ImageData_Impl();
+
   PP_ImageDataFormat format_;
   int width_;
   int height_;
@@ -130,10 +131,10 @@
   virtual ~ImageDataSimpleBackend();
 
   // PPB_ImageData_Impl::Backend implementation.
-  bool Init(PPB_ImageData_Impl* impl, PP_ImageDataFormat format,
+  virtual 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 PluginDelegate::PlatformImage2D* PlatformImage() const OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
   virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) OVERRIDE;
@@ -193,4 +194,4 @@
 }  // namespace ppapi
 }  // namespace webkit
 
-#endif  // WEBKIT_PLUGINS_PPAPI_PPB_IMAGE_DATA_IMPL_H_
+#endif  // CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_