Pull new PPAPI, rename non-P0 interfaces to Dev, rename DeviceContext2D to Gr...

webkit/glue/plugins/pepper_graphics_3d.h

 // Copyright (c) 2010 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_GLUE_PLUGINS_PEPPER_GRAPHICS_3D_H_
 #define WEBKIT_GLUE_PLUGINS_PEPPER_GRAPHICS_3D_H_
 
 #include "base/scoped_ptr.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
-#include "third_party/ppapi/c/ppb_graphics_3d.h"
+#include "third_party/ppapi/c/pp_instance.h"
 #include "webkit/glue/plugins/pepper_plugin_delegate.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
-
 namespace gfx {
 class Rect;
 }  // namespace gfx
 
 namespace gpu {
 class CommandBuffer;
 }  // namespace gpu
 
-typedef struct _ppb_OpenGLES PPB_OpenGLES;
+struct PPB_Graphics3D_Dev;
+struct PPB_OpenGLES_Dev;
 
 namespace pepper {
 
 class Graphics3D : public Resource {
  public:
   explicit Graphics3D(PluginModule* module);
 
   virtual ~Graphics3D();
 
-  static const PPB_Graphics3D* GetInterface();
-
-  static const PPB_OpenGLES* GetOpenGLESInterface();
+  static const PPB_Graphics3D_Dev* GetInterface();
+  static const PPB_OpenGLES_Dev* GetOpenGLESInterface();
 
   static bool Shutdown();
 
   static Graphics3D* GetCurrent();
 
   static void ResetCurrent();
 
   // Resource override.
   virtual Graphics3D* AsGraphics3D() {
     return this;
@@ skipping 30 matching lines @@
   scoped_ptr<gpu::gles2::GLES2Implementation> gles2_implementation_;
 
   // Runnable methods that must be cancelled when the 3D context is destroyed.
   ScopedRunnableMethodFactory<Graphics3D> method_factory3d_;
 };
 
 }  // namespace pepper
 
 #endif  // WEBKIT_GLUE_PLUGINS_PEPPER_GRAPHICS_3D_H_