Index: webkit/plugins/ppapi/ppb_graphics_3d_impl.h |
=================================================================== |
--- webkit/plugins/ppapi/ppb_graphics_3d_impl.h (revision 0) |
+++ webkit/plugins/ppapi/ppb_graphics_3d_impl.h (working copy) |
@@ -2,53 +2,53 @@ |
// 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_ |
+#ifndef WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_ |
+#define WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_ |
+#include "base/basictypes.h" |
#include "base/callback.h" |
#include "base/scoped_ptr.h" |
#include "gfx/size.h" |
#include "gpu/command_buffer/client/gles2_cmd_helper.h" |
#include "gpu/command_buffer/client/gles2_implementation.h" |
#include "ppapi/c/pp_instance.h" |
-#include "webkit/glue/plugins/pepper_plugin_delegate.h" |
-#include "webkit/glue/plugins/pepper_resource.h" |
+#include "webkit/plugins/ppapi/plugin_delegate.h" |
+#include "webkit/plugins/ppapi/resource.h" |
namespace gpu { |
namespace gles2 { |
class GLES2Implementation; |
-} |
+} // namespace gles2 |
} // namespace gpu |
struct PPB_Graphics3D_Dev; |
struct PPB_OpenGLES_Dev; |
-namespace pepper { |
+namespace webkit { |
+namespace ppapi { |
-class Graphics3D : public Resource { |
+class PPB_Graphics3D_Impl : public Resource { |
public: |
- explicit Graphics3D(PluginModule* module); |
+ explicit PPB_Graphics3D_Impl(PluginModule* module); |
- virtual ~Graphics3D(); |
+ virtual ~PPB_Graphics3D_Impl(); |
static const PPB_Graphics3D_Dev* GetInterface(); |
static const PPB_OpenGLES_Dev* GetOpenGLESInterface(); |
static bool Shutdown(); |
- static Graphics3D* GetCurrent(); |
+ static PPB_Graphics3D_Impl* GetCurrent(); |
static void ResetCurrent(); |
// Resource override. |
- virtual Graphics3D* AsGraphics3D() { |
- return this; |
- } |
+ virtual PPB_Graphics3D_Impl* AsPPB_Graphics3D_Impl(); |
bool Init(PP_Instance instance_id, int32_t config, |
const int32_t* attrib_list); |
- // Associates this Graphics3D with the given plugin instance. You can pass |
+ // Associates this PPB_Graphics3D_Impl with the given plugin instance. You can pass |
// NULL to clear the existing device. Returns true on success. In this case, |
// the last rendered frame is displayed. |
// TODO(apatrick): Figure out the best semantics here. |
@@ -82,9 +82,12 @@ |
// GLES2 Implementation instance. Owned by the platform context's GGL context. |
gpu::gles2::GLES2Implementation* gles2_implementation_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Impl); |
}; |
-} // namespace pepper |
+} // namespace ppapi |
+} // namespace webkit |
-#endif // WEBKIT_GLUE_PLUGINS_PEPPER_GRAPHICS_3D_H_ |
+#endif // WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_ |