reconstitute moving 3d out of dev CL. (previous attempt was reverted)

previous CL: http://codereview.chromium.org/7737013/
BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= try bots, manual testing
Review URL: http://codereview.chromium.org/7837018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99968 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 90ff54a..0384acf 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -5753,10 +5753,10 @@ const size_t GLES2Util::enum_to_string_table_len_ =
       file.Write("typedef %s %s;\n" % (v, k))
     file.Write("#endif  // __gl2_h_\n\n")
 
-    file.Write("#define PPB_OPENGLES2_DEV_INTERFACE "
-        "\"PPB_OpenGLES(Dev);2.0\"\n")
+    file.Write("#define PPB_OPENGLES2_INTERFACE "
+        "\"PPB_OpenGLES;2.0\"\n")
 
-    file.Write("\nstruct PPB_OpenGLES2_Dev {\n")
+    file.Write("\nstruct PPB_OpenGLES2 {\n")
     for func in self.original_functions:
       if not func.IsCoreGLFunction():
         continue
@@ -5818,7 +5818,7 @@ const size_t GLES2Util::enum_to_string_table_len_ =
                   func.MakeOriginalArgString("")))
       file.Write("}\n\n")
 
-    file.Write("\nconst struct PPB_OpenGLES2_Dev ppb_opengles2 = {\n")
+    file.Write("\nconst struct PPB_OpenGLES2 ppb_opengles2 = {\n")
     file.Write("  &")
     file.Write(",\n  &".join(
       f.name for f in self.original_functions if f.IsCoreGLFunction()))
@@ -5828,7 +5828,7 @@ const size_t GLES2Util::enum_to_string_table_len_ =
     file.Write("}  // namespace\n")
 
     file.Write("""
-const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
+const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() {
   return &ppb_opengles2;
 }
 
@@ -5904,10 +5904,10 @@ const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
 
     file.Write("\n} // namespace\n\n")
 
-    file.Write("const PPB_OpenGLES2_Dev* "
+    file.Write("const PPB_OpenGLES2* "
                "PluginGraphics3D::GetOpenGLESInterface() {\n")
 
-    file.Write("  const static struct PPB_OpenGLES2_Dev ppb_opengles = {\n")
+    file.Write("  const static struct PPB_OpenGLES2 ppb_opengles = {\n")
     file.Write("    &")
     file.Write(",\n    &".join(
       f.name for f in self.original_functions if (f.IsCoreGLFunction() and
diff --git a/gpu/demos/framework/pepper.cc b/gpu/demos/framework/pepper.cc
index 9be8085..3a2e180b 100644
--- a/gpu/demos/framework/pepper.cc
+++ b/gpu/demos/framework/pepper.cc
@@ -7,11 +7,11 @@
 #include "gpu/demos/framework/demo.h"
 #include "gpu/demos/framework/demo_factory.h"
 #include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
-#include "ppapi/cpp/dev/graphics_3d_dev.h"
 #include "ppapi/lib/gl/gles2/gl2ext_ppapi.h"
 
 namespace gpu {
@@ -88,7 +88,7 @@ class PluginInstance : public pp::Instance {
         PP_GRAPHICS3DATTRIB_HEIGHT, size_.height(),
         PP_GRAPHICS3DATTRIB_NONE
     };
-    context_ = pp::Graphics3D_Dev(*this, pp::Graphics3D_Dev(), attribs);
+    context_ = pp::Graphics3D(*this, pp::Graphics3D(), attribs);
     if (context_.is_null())
       return;
 
@@ -110,7 +110,7 @@ class PluginInstance : public pp::Instance {
 
   pp::Module* module_;
   Demo* demo_;
-  pp::Graphics3D_Dev context_;
+  pp::Graphics3D context_;
   pp::Size size_;
   bool swap_pending_;
   bool paint_needed_;