Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/resource.h

Index: webkit/plugins/ppapi/resource.h
===================================================================
--- webkit/plugins/ppapi/resource.h	(revision 0)
+++ webkit/plugins/ppapi/resource.h	(working copy)
@@ -2,44 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_RESOURCE_H_
+#define WEBKIT_PLUGINS_PPAPI_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "ppapi/c/pp_resource.h"
-#include "webkit/glue/plugins/pepper_resource_tracker.h"
+#include "webkit/plugins/ppapi/resource_tracker.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 // If you inherit from resource, make sure you add the class name here.
 #define FOR_ALL_RESOURCES(F) \
-  F(Audio) \
-  F(AudioConfig) \
-  F(Buffer) \
-  F(DirectoryReader) \
-  F(FileChooser) \
-  F(FileIO) \
-  F(FileRef) \
-  F(FileSystem) \
-  F(Font) \
-  F(Graphics2D) \
-  F(Graphics3D) \
-  F(ImageData) \
   F(MockResource) \
   F(ObjectVar) \
-  F(PluginModule) \
+  F(PPB_AudioConfig_Impl) \
+  F(PPB_Audio_Impl) \
+  F(PPB_Buffer_Impl) \
+  F(PPB_DirectoryReader_Impl) \
+  F(PPB_FileChooser_Impl) \
+  F(PPB_FileIO_Impl) \
+  F(PPB_FileRef_Impl) \
+  F(PPB_FileSystem_Impl) \
+  F(PPB_Font_Impl) \
+  F(PPB_Graphics2D_Impl) \
+  F(PPB_Graphics3D_Impl) \
+  F(PPB_ImageData_Impl) \
+  F(PPB_Scrollbar_Impl) \
+  F(PPB_Transport_Impl) \
+  F(PPB_URLLoader_Impl) \
+  F(PPB_URLRequestInfo_Impl) \
+  F(PPB_URLResponseInfo_Impl) \
+  F(PPB_VideoDecoder_Impl) \
+  F(PPB_Widget_Impl) \
   F(PrivateFontFile) \
-  F(Scrollbar) \
   F(StringVar) \
-  F(Transport) \
-  F(URLLoader) \
-  F(URLRequestInfo) \
-  F(URLResponseInfo) \
   F(Var) \
-  F(VarObjectClass) \
-  F(VideoDecoder) \
-  F(Widget)
+  F(VarObjectClass)
 
 // Forward declaration of Resource classes.
 #define DECLARE_RESOURCE_CLASS(RESOURCE) class RESOURCE;
@@ -103,7 +103,7 @@
   // NULL if the resource does not match the specified type. Used by the Cast()
   // function.
   #define DEFINE_TYPE_GETTER(RESOURCE)  \
-      virtual RESOURCE* As##RESOURCE() { return NULL; }
+      virtual RESOURCE* As##RESOURCE();
   FOR_ALL_RESOURCES(DEFINE_TYPE_GETTER)
   #undef DEFINE_TYPE_GETTER
 
@@ -129,13 +129,13 @@
 // Cast() specializations.
 #define DEFINE_RESOURCE_CAST(Type)                   \
   template <> inline Type* Resource::Cast<Type>() {  \
-      return As##Type();                             \
+    return As##Type();                               \
   }
 
 FOR_ALL_RESOURCES(DEFINE_RESOURCE_CAST)
 #undef DEFINE_RESOURCE_CAST
 
-#undef FOR_ALL_RESOURCES
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_RESOURCE_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_RESOURCE_H_