Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= various nacl exmaples, try bots
Review URL: http://codereview.chromium.org/7737013

TBR=nfullagar@google.com
Review URL: http://codereview.chromium.org/7782020

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

9 files changed, 17 insertions, 17 deletions

diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index 7c099a7..a9c5dd7 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -18,6 +18,7 @@
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
+#include "ppapi/c/dev/ppb_opengles_dev.h"
 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
@@ -29,7 +30,6 @@
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
-#include "ppapi/c/ppb_opengles.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"
diff --git a/ppapi/proxy/interface_id.h b/ppapi/proxy/interface_id.h
index 595b2c8..c909806 100644
--- a/ppapi/proxy/interface_id.h
+++ b/ppapi/proxy/interface_id.h
@@ -55,7 +55,7 @@ enum InterfaceID {
   INTERFACE_ID_PPB_VIDEO_DECODER_DEV,
 
   INTERFACE_ID_PPP_CLASS,
-  INTERFACE_ID_PPP_GRAPHICS_3D,
+  INTERFACE_ID_PPP_GRAPHICS_3D_DEV,
   INTERFACE_ID_PPP_INPUT_EVENT,
   INTERFACE_ID_PPP_INSTANCE,
   INTERFACE_ID_PPP_INSTANCE_PRIVATE,
diff --git a/ppapi/proxy/ppb_context_3d_proxy.h b/ppapi/proxy/ppb_context_3d_proxy.h
index a24a78d..8a49efe 100644
--- a/ppapi/proxy/ppb_context_3d_proxy.h
+++ b/ppapi/proxy/ppb_context_3d_proxy.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "gpu/command_buffer/common/command_buffer.h"
-#include "ppapi/c/pp_graphics_3d.h"
+#include "ppapi/c/dev/pp_graphics_3d_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc
index 31d9ccb..834f49e 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
@@ -408,7 +408,7 @@ PPB_Graphics3D_Proxy::~PPB_Graphics3D_Proxy() {
 const InterfaceProxy::Info* PPB_Graphics3D_Proxy::GetInfo() {
   static const Info info = {
     thunk::GetPPB_Graphics3D_Thunk(),
-    PPB_GRAPHICS_3D_INTERFACE,
+    PPB_GRAPHICS_3D_DEV_INTERFACE,
     INTERFACE_ID_PPB_GRAPHICS_3D,
     false,
     &CreateGraphics3DProxy,
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index 4fd97a2..db67a2f 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -9,7 +9,7 @@
 
 #include "base/shared_memory.h"
 #include "gpu/command_buffer/common/command_buffer.h"
-#include "ppapi/c/pp_graphics_3d.h"
+#include "ppapi/c/dev/pp_graphics_3d_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
@@ -72,8 +72,8 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
                                          PP_Resource share_context,
                                          const int32_t* attrib_list);
 
-  const PPB_Graphics3D* ppb_graphics_3d_target() const {
-    return static_cast<const PPB_Graphics3D*>(target_interface());
+  const PPB_Graphics3D_Dev* ppb_graphics_3d_target() const {
+    return static_cast<const PPB_Graphics3D_Dev*>(target_interface());
   }
 
   // InterfaceProxy implementation.
diff --git a/ppapi/proxy/ppb_opengles2_proxy.cc b/ppapi/proxy/ppb_opengles2_proxy.cc
index 9516678..af22cf0 100644
--- a/ppapi/proxy/ppb_opengles2_proxy.cc
+++ b/ppapi/proxy/ppb_opengles2_proxy.cc
@@ -28,7 +28,7 @@ PPB_OpenGLES2_Proxy::~PPB_OpenGLES2_Proxy() {
 const InterfaceProxy::Info* PPB_OpenGLES2_Proxy::GetInfo() {
   static const Info info = {
     ppapi::OpenGLES2Impl::GetInterface(),
-    PPB_OPENGLES2_INTERFACE,
+    PPB_OPENGLES2_DEV_INTERFACE,
     INTERFACE_ID_PPB_OPENGLES2,
     false,
     &CreateOpenGLES2Proxy,
diff --git a/ppapi/proxy/ppb_surface_3d_proxy.h b/ppapi/proxy/ppb_surface_3d_proxy.h
index ce7e8b6..214bda1 100644
--- a/ppapi/proxy/ppb_surface_3d_proxy.h
+++ b/ppapi/proxy/ppb_surface_3d_proxy.h
@@ -7,8 +7,8 @@
 
 #include <vector>
 
+#include "ppapi/c/dev/pp_graphics_3d_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_graphics_3d.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
diff --git a/ppapi/proxy/ppp_graphics_3d_proxy.cc b/ppapi/proxy/ppp_graphics_3d_proxy.cc
index a477227..2ca0231 100644
--- a/ppapi/proxy/ppp_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppp_graphics_3d_proxy.cc
@@ -4,7 +4,7 @@
 
 #include "ppapi/proxy/ppp_graphics_3d_proxy.h"
 
-#include "ppapi/c/ppp_graphics_3d.h"
+#include "ppapi/c/dev/ppp_graphics_3d_dev.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -16,11 +16,11 @@ namespace {
 
 void ContextLost(PP_Instance instance) {
   HostDispatcher::GetForInstance(instance)->Send(
-      new PpapiMsg_PPPGraphics3D_ContextLost(INTERFACE_ID_PPP_GRAPHICS_3D,
+      new PpapiMsg_PPPGraphics3D_ContextLost(INTERFACE_ID_PPP_GRAPHICS_3D_DEV,
                                              instance));
 }
 
-static const PPP_Graphics3D graphics_3d_interface = {
+static const PPP_Graphics3D_Dev graphics_3d_interface = {
   &ContextLost
 };
 
@@ -43,8 +43,8 @@ PPP_Graphics3D_Proxy::~PPP_Graphics3D_Proxy() {
 const InterfaceProxy::Info* PPP_Graphics3D_Proxy::GetInfo() {
   static const Info info = {
     &graphics_3d_interface,
-    PPP_GRAPHICS_3D_INTERFACE,
-    INTERFACE_ID_PPP_GRAPHICS_3D,
+    PPP_GRAPHICS_3D_DEV_INTERFACE,
+    INTERFACE_ID_PPP_GRAPHICS_3D_DEV,
     false,
     &CreateGraphics3DProxy,
   };
diff --git a/ppapi/proxy/ppp_graphics_3d_proxy.h b/ppapi/proxy/ppp_graphics_3d_proxy.h
index eb3d3b0..8d9fac3 100644
--- a/ppapi/proxy/ppp_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppp_graphics_3d_proxy.h
@@ -9,7 +9,7 @@
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
 
-struct PPP_Graphics3D;
+struct PPP_Graphics3D_Dev;
 
 namespace ppapi {
 namespace proxy {
@@ -21,8 +21,8 @@ class PPP_Graphics3D_Proxy : public InterfaceProxy {
 
   static const Info* GetInfo();
 
-  const PPP_Graphics3D* ppp_graphics_3d_target() const {
-    return reinterpret_cast<const PPP_Graphics3D*>(target_interface());
+  const PPP_Graphics3D_Dev* ppp_graphics_3d_target() const {
+    return reinterpret_cast<const PPP_Graphics3D_Dev*>(target_interface());
   }
 
   // InterfaceProxy implementation.