Removed config management from Graphics3D API. It will be better handled in the EGL helper library.

Also removed redundant enums from the API.
Review URL: http://codereview.chromium.org/7576012

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

6 files changed, 5 insertions, 15 deletions

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 14799d73..24dd61c 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -720,9 +720,8 @@ IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBGraphics2D_Flush,
                     ppapi::HostResource /* graphics_2d */)
 
 // PPB_Graphics3D.
-IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create,
+IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBGraphics3D_Create,
                            PP_Instance /* instance */,
-                           int32_t /* config */,
                            std::vector<int32_t> /* attrib_list */,
                            ppapi::HostResource /* result */)
 
diff --git a/ppapi/proxy/ppb_context_3d_proxy.cc b/ppapi/proxy/ppb_context_3d_proxy.cc
index fd37cac..b7e5066 100644
--- a/ppapi/proxy/ppb_context_3d_proxy.cc
+++ b/ppapi/proxy/ppb_context_3d_proxy.cc
@@ -399,7 +399,7 @@ int32_t Context3D::BindSurfaces(PP_Resource pp_draw, PP_Resource pp_read) {
   // TODO(alokp): Support separate draw-read surfaces.
   DCHECK_EQ(pp_draw, pp_read);
   if (pp_draw != pp_read)
-    return PP_GRAPHICS3DERROR_BAD_MATCH;
+    return PP_ERROR_BADARGUMENT;
 
   EnterResourceNoLock<PPB_Surface3D_API> enter_draw(pp_draw, false);
   EnterResourceNoLock<PPB_Surface3D_API> enter_read(pp_read, false);
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc
index 1b4d32c..51b567e 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
@@ -420,7 +420,6 @@ const InterfaceProxy::Info* PPB_Graphics3D_Proxy::GetInfo() {
 // static
 PP_Resource PPB_Graphics3D_Proxy::CreateProxyResource(
     PP_Instance instance,
-    PP_Config3D_Dev config,
     PP_Resource share_context,
     const int32_t* attrib_list) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
@@ -445,7 +444,7 @@ PP_Resource PPB_Graphics3D_Proxy::CreateProxyResource(
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(
-      INTERFACE_ID_PPB_GRAPHICS_3D, instance, config, attribs, &result));
+      INTERFACE_ID_PPB_GRAPHICS_3D, instance, attribs, &result));
   if (result.is_null())
     return 0;
 
@@ -488,7 +487,6 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance,
-                                       PP_Config3D_Dev config,
                                        const std::vector<int32_t>& attribs,
                                        HostResource* result) {
   if (attribs.empty() || attribs.back() != PP_GRAPHICS3DATTRIB_NONE)
@@ -498,8 +496,7 @@ void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance,
   if (enter.succeeded()) {
     result->SetHostResource(
         instance,
-        enter.functions()->CreateGraphics3DRaw(instance, config, 0,
-                                               &attribs.front()));
+        enter.functions()->CreateGraphics3DRaw(instance, 0, &attribs.front()));
   }
 }
 
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index 173dc3c..a304de3 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -71,7 +71,6 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
   static const Info* GetInfo();
 
   static PP_Resource CreateProxyResource(PP_Instance instance,
-                                         PP_Config3D_Dev config,
                                          PP_Resource share_context,
                                          const int32_t* attrib_list);
 
@@ -84,7 +83,6 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
 
  private:
   void OnMsgCreate(PP_Instance instance,
-                   PP_Config3D_Dev config,
                    const std::vector<int32_t>& attribs,
                    ppapi::HostResource* result);
   void OnMsgInitCommandBuffer(const ppapi::HostResource& context,
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index fc4a48c..201eef1 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -251,16 +251,14 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
 
 PP_Resource ResourceCreationProxy::CreateGraphics3D(
     PP_Instance instance,
-    PP_Config3D_Dev config,
     PP_Resource share_context,
     const int32_t* attrib_list) {
   return PPB_Graphics3D_Proxy::CreateProxyResource(
-      instance, config, share_context, attrib_list);
+      instance, share_context, attrib_list);
 }
 
 PP_Resource ResourceCreationProxy::CreateGraphics3DRaw(
     PP_Instance instance,
-    PP_Config3D_Dev config,
     PP_Resource share_context,
     const int32_t* attrib_list) {
   // Not proxied. The raw creation function is used only in the implementation
diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h
index 2dacd6c..db5ab94 100644
--- a/ppapi/proxy/resource_creation_proxy.h
+++ b/ppapi/proxy/resource_creation_proxy.h
@@ -76,11 +76,9 @@ class ResourceCreationProxy : public ::ppapi::FunctionGroupBase,
                                        const PP_Size& size,
                                        PP_Bool is_always_opaque) OVERRIDE;
   virtual PP_Resource CreateGraphics3D(PP_Instance instance,
-                                       PP_Config3D_Dev config,
                                        PP_Resource share_context,
                                        const int32_t* attrib_list) OVERRIDE;
   virtual PP_Resource CreateGraphics3DRaw(PP_Instance instance,
-                                          PP_Config3D_Dev config,
                                           PP_Resource share_context,
                                           const int32_t* attrib_list) OVERRIDE;
   virtual PP_Resource CreateImageData(PP_Instance instance,