diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 20:42:04 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 20:42:04 +0000 |
| commit | 486015170893e58575428f593d310ca2110d8699 (patch) | |
| tree | ac619279238cebd6f54674afcadb0c07b301be12 | |
| parent | 768e4ff6892503dfbff4d06e7098e751dd28e85b (diff) | |
| download | chromium_src-486015170893e58575428f593d310ca2110d8699.zip chromium_src-486015170893e58575428f593d310ca2110d8699.tar.gz chromium_src-486015170893e58575428f593d310ca2110d8699.tar.bz2 | |
Add Graphics3DTrusted dev interface for proxy.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7587017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96445 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/thunk/thunk.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h index c7ac742..58bede7 100644 --- a/ppapi/thunk/thunk.h +++ b/ppapi/thunk/thunk.h @@ -30,6 +30,7 @@ struct PPB_Fullscreen_Dev; struct PPB_GLESChromiumTextureMapping_Dev; struct PPB_Graphics2D; struct PPB_Graphics3D_Dev; +struct PPB_Graphics3DTrusted_Dev; struct PPB_ImageData; struct PPB_ImageDataTrusted; struct PPB_InputEvent; @@ -85,6 +86,7 @@ const PPB_GLESChromiumTextureMapping_Dev* GetPPB_GLESChromiumTextureMapping_Thunk(); const PPB_Graphics2D* GetPPB_Graphics2D_Thunk(); const PPB_Graphics3D_Dev* GetPPB_Graphics3D_Thunk(); +const PPB_Graphics3DTrusted_Dev* GetPPB_Graphics3DTrusted_Thunk(); const PPB_InputEvent* GetPPB_InputEvent_Thunk(); const PPB_ImageData* GetPPB_ImageData_Thunk(); const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk(); diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index a7d7ab3..1600c59 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -26,6 +26,7 @@ #include "ppapi/c/dev/ppb_fullscreen_dev.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_graphics_3d_dev.h" +#include "ppapi/c/dev/ppb_graphics_3d_trusted_dev.h" #include "ppapi/c/dev/ppb_layer_compositor_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_opengles_dev.h" @@ -340,6 +341,8 @@ const void* GetInterface(const char* name) { #ifdef ENABLE_GPU if (strcmp(name, PPB_GRAPHICS_3D_DEV_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Graphics3D_Thunk(); + if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_DEV_INTERFACE) == 0) + return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); if (strcmp(name, PPB_CONTEXT_3D_DEV_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Context3D_Thunk(); if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0) |