diff options
author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 22:38:58 +0000 |
---|---|---|
committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 22:38:58 +0000 |
commit | 76cab2ae4a11b179832c5a10287d95362eda25d5 (patch) | |
tree | aa118a5182a91f5acdc888eb293982602e0e619a /ppapi | |
parent | bc645904698943244376d794f9fb6a27052d2659 (diff) | |
download | chromium_src-76cab2ae4a11b179832c5a10287d95362eda25d5.zip chromium_src-76cab2ae4a11b179832c5a10287d95362eda25d5.tar.gz chromium_src-76cab2ae4a11b179832c5a10287d95362eda25d5.tar.bz2 |
Removed PPB_Graphics3D::GetString(). Versioning should be handled in pepper at a higher level.
Review URL: http://codereview.chromium.org/7624003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/c/dev/pp_graphics_3d_dev.h | 7 | ||||
-rw-r--r-- | ppapi/c/dev/ppb_graphics_3d_dev.h | 24 | ||||
-rw-r--r-- | ppapi/cpp/dev/graphics_3d_dev.cc | 9 | ||||
-rw-r--r-- | ppapi/cpp/dev/graphics_3d_dev.h | 2 | ||||
-rw-r--r-- | ppapi/thunk/ppb_graphics_3d_thunk.cc | 6 |
5 files changed, 2 insertions, 46 deletions
diff --git a/ppapi/c/dev/pp_graphics_3d_dev.h b/ppapi/c/dev/pp_graphics_3d_dev.h index bc2ebe8..34544ee 100644 --- a/ppapi/c/dev/pp_graphics_3d_dev.h +++ b/ppapi/c/dev/pp_graphics_3d_dev.h @@ -13,13 +13,6 @@ enum PP_Graphics3DError_Dev { PP_GRAPHICS3DERROR_CONTEXT_LOST = 0x300E }; -enum PP_Graphics3DString_Dev { - PP_GRAPHICS3DSTRING_VENDOR = 0x3053, - PP_GRAPHICS3DSTRING_VERSION = 0x3054, - // Which extensions are supported. - PP_GRAPHICS3DSTRING_EXTENSIONS = 0x3055 -}; - enum PP_Graphics3DAttrib_Dev { // Bits of Alpha in the color buffer. PP_GRAPHICS3DATTRIB_ALPHA_SIZE = 0x3021, diff --git a/ppapi/c/dev/ppb_graphics_3d_dev.h b/ppapi/c/dev/ppb_graphics_3d_dev.h index 7d7ce1d..aa93c1a 100644 --- a/ppapi/c/dev/ppb_graphics_3d_dev.h +++ b/ppapi/c/dev/ppb_graphics_3d_dev.h @@ -10,7 +10,6 @@ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" -#include "ppapi/c/pp_var.h" // Example usage from plugin code: // @@ -29,29 +28,10 @@ // // Shutdown. // core->ReleaseResource(context); -#define PPB_GRAPHICS_3D_DEV_INTERFACE_0_7 "PPB_Graphics3D(Dev);0.7" -#define PPB_GRAPHICS_3D_DEV_INTERFACE PPB_GRAPHICS_3D_DEV_INTERFACE_0_7 +#define PPB_GRAPHICS_3D_DEV_INTERFACE_0_8 "PPB_Graphics3D(Dev);0.8" +#define PPB_GRAPHICS_3D_DEV_INTERFACE PPB_GRAPHICS_3D_DEV_INTERFACE_0_8 struct PPB_Graphics3D_Dev { - // Returns a string describing some aspect of the Graphics3D implementation. - // name may be one of: - // - PP_GRAPHICS3DSTRING_EXTENSIONS: describes which extensions are supported - // by the implementation. The string is zero-terminated and contains a - // space-separated list of extension names; extension names themselves do - // not contain spaces. If there are no extensions, then the empty string is - // returned. - // - PP_GRAPHICS3DSTRING_VENDOR: Implementation dependent. - // - PP_GRAPHICS3DSTRING_VERSION: The format of the string is: - // <major version.minor version><space><vendor specific info> - // Both the major and minor portions of the version number are numeric. - // The vendor-specific information is optional; if present, its format and - // contents are implementation specific. - // On failure, PP_VARTYPE_UNDEFINED is returned. - // - // TODO(alokp): Does this function need module argument? - // - struct PP_Var (*GetString)(int32_t name); - // Creates and initializes a rendering context and returns a handle to it. // The returned context is off-screen to start with. It must be attached to // a plugin instance using PPB_Instance::BindGraphics to draw on the web page. diff --git a/ppapi/cpp/dev/graphics_3d_dev.cc b/ppapi/cpp/dev/graphics_3d_dev.cc index 3e27d1b..953b859 100644 --- a/ppapi/cpp/dev/graphics_3d_dev.cc +++ b/ppapi/cpp/dev/graphics_3d_dev.cc @@ -37,15 +37,6 @@ Graphics3D_Dev::Graphics3D_Dev(const Instance& instance, Graphics3D_Dev::~Graphics3D_Dev() { } -// static -Var Graphics3D_Dev::GetString(int32_t name) { - if (!has_interface<PPB_Graphics3D_Dev>()) - return Var(); - - return Var(Var::PassRef(), - get_interface<PPB_Graphics3D_Dev>()->GetString(name)); -} - int32_t Graphics3D_Dev::GetAttribs(int32_t* attrib_list) const { if (!has_interface<PPB_Graphics3D_Dev>()) return PP_ERROR_NOINTERFACE; diff --git a/ppapi/cpp/dev/graphics_3d_dev.h b/ppapi/cpp/dev/graphics_3d_dev.h index 0cac284..30a46e7 100644 --- a/ppapi/cpp/dev/graphics_3d_dev.h +++ b/ppapi/cpp/dev/graphics_3d_dev.h @@ -25,8 +25,6 @@ class Graphics3D_Dev : public Resource { ~Graphics3D_Dev(); - static Var GetString(int32_t name); - int32_t GetAttribs(int32_t* attrib_list) const; int32_t SetAttribs(int32_t* attrib_list); diff --git a/ppapi/thunk/ppb_graphics_3d_thunk.cc b/ppapi/thunk/ppb_graphics_3d_thunk.cc index 9fab8b2..50c31fc 100644 --- a/ppapi/thunk/ppb_graphics_3d_thunk.cc +++ b/ppapi/thunk/ppb_graphics_3d_thunk.cc @@ -17,11 +17,6 @@ namespace { typedef EnterResource<PPB_Graphics3D_API> EnterGraphics3D; -PP_Var GetString(int32_t name) { - // TODO(alokp): Implement me. - return PP_MakeUndefined(); -} - PP_Resource Create(PP_Instance instance, PP_Resource share_context, const int32_t* attrib_list) { @@ -67,7 +62,6 @@ int32_t SwapBuffers(PP_Resource graphics_3d, PP_CompletionCallback callback) { } const PPB_Graphics3D_Dev g_ppb_graphics_3d_thunk = { - &GetString, &Create, &IsGraphics3D, &GetAttribs, |