Remove Context3D/Surface3D

Graphics3D is the new black.

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/8676042

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

11 files changed, 10 insertions, 413 deletions

diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index 17defe9..93f5450 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -20,9 +20,4 @@ PROXIED_IFACE(PPB_TCPSocket_Private, PPB_TCPSOCKET_PRIVATE_INTERFACE,
 PROXIED_IFACE(PPB_UDPSocket_Private, PPB_UDPSOCKET_PRIVATE_INTERFACE,
               PPB_UDPSocket_Private)
 
-// Map the old fullscreen interface string to the Flash one, which is the same
-// at the ABI level. TODO(polina): remove this when Flash is updated.
-PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_DEV_INTERFACE_0_4,
-              PPB_FlashFullscreen)
-
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 32dcb1d..c3fb3e4 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -9,7 +9,6 @@
 
 PROXIED_API(PPB_AudioInput)
 PROXIED_API(PPB_Buffer)
-PROXIED_API(PPB_Context3D)
 PROXIED_API(PPB_CursorControl)
 UNPROXIED_API(PPB_DirectoryReader)
 PROXIED_API(PPB_FileChooser)
@@ -17,7 +16,6 @@ PROXIED_API(PPB_Font)
 PROXIED_API(PPB_Graphics3D)
 UNPROXIED_API(PPB_LayerCompositor)
 UNPROXIED_API(PPB_Scrollbar)
-PROXIED_API(PPB_Surface3D)
 PROXIED_API(PPB_TextInput)
 UNPROXIED_API(PPB_Transport)
 PROXIED_API(PPB_VideoCapture)
@@ -30,9 +28,7 @@ PROXIED_IFACE(PPB_AudioInput, PPB_AUDIO_INPUT_DEV_INTERFACE_0_1,
 PROXIED_IFACE(NoAPIName, PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1,
               PPB_IMEInputEvent_Dev)
 PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev)
-PROXIED_IFACE(PPB_Context3D, PPB_CONTEXT_3D_DEV_INTERFACE_0_1,
-              PPB_Context3D_Dev)
-PROXIED_IFACE(PPB_Context3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
+PROXIED_IFACE(PPB_Graphics3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
               PPB_GLESChromiumTextureMapping_Dev)
 PROXIED_IFACE(NoAPIName, PPB_CRYPTO_DEV_INTERFACE, PPB_Crypto_Dev)
 PROXIED_IFACE(PPB_CursorControl, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4,
@@ -52,8 +48,6 @@ UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2,
 PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE, PPB_Memory_Dev)
 UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5,
                 PPB_Scrollbar_Dev)
-PROXIED_IFACE(PPB_Surface3D, PPB_SURFACE_3D_DEV_INTERFACE_0_2,
-              PPB_Surface3D_Dev)
 PROXIED_IFACE(PPB_TextInput, PPB_TEXTINPUT_DEV_INTERFACE_0_1,
               PPB_TextInput_Dev)
 UNPROXIED_IFACE(PPB_Transport, PPB_TRANSPORT_DEV_INTERFACE_0_7,
diff --git a/ppapi/thunk/ppb_context_3d_api.h b/ppapi/thunk/ppb_context_3d_api.h
deleted file mode 100644
index feeba89..0000000
--- a/ppapi/thunk/ppb_context_3d_api.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_PPB_CONTEXT_3D_API_H_
-#define PPAPI_THUNK_PPB_CONTEXT_3D_API_H_
-
-#include "ppapi/c/dev/ppb_context_3d_dev.h"
-#include "ppapi/c/dev/ppb_context_3d_trusted_dev.h"
-#include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
-
-namespace gpu {
-namespace gles2 {
-class GLES2Implementation;
-}  // namespace gles2
-}  // namespace gpu
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_Context3D_API {
- public:
-  virtual ~PPB_Context3D_API() {}
-
-  // Context3D.
-  virtual int32_t GetAttrib(int32_t attribute, int32_t* value) = 0;
-  virtual int32_t BindSurfaces(PP_Resource draw, PP_Resource read) = 0;
-  virtual int32_t GetBoundSurfaces(PP_Resource* draw, PP_Resource* read) = 0;
-
-  // Context3DTrusted.
-  virtual PP_Bool InitializeTrusted(int32_t size) = 0;
-  virtual PP_Bool GetRingBuffer(int* shm_handle,
-                                uint32_t* shm_size) = 0;
-  virtual PP_Context3DTrustedState GetState() = 0;
-  virtual PP_Bool Flush(int32_t put_offset) = 0;
-  virtual PP_Context3DTrustedState FlushSync(int32_t put_offset) = 0;
-  virtual int32_t CreateTransferBuffer(uint32_t size) = 0;
-  virtual PP_Bool DestroyTransferBuffer(int32_t id) = 0;
-  virtual PP_Bool GetTransferBuffer(int32_t id,
-                                    int* shm_handle,
-                                    uint32_t* shm_size) = 0;
-  virtual PP_Context3DTrustedState FlushSyncFast(int32_t put_offset,
-                                                 int32_t last_known_get) = 0;
-
-  // GLESChromiumTextureMapping.
-  virtual void* MapTexSubImage2DCHROMIUM(GLenum target,
-                                         GLint level,
-                                         GLint xoffset,
-                                         GLint yoffset,
-                                         GLsizei width,
-                                         GLsizei height,
-                                         GLenum format,
-                                         GLenum type,
-                                         GLenum access) = 0;
-  virtual void UnmapTexSubImage2DCHROMIUM(const void* mem) = 0;
-
-  // For binding with OpenGLES interface.
-  virtual gpu::gles2::GLES2Implementation* GetGLES2Impl() = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_CONTEXT_3D_API_H_
diff --git a/ppapi/thunk/ppb_context_3d_thunk.cc b/ppapi/thunk/ppb_context_3d_thunk.cc
deleted file mode 100644
index 200e044..0000000
--- a/ppapi/thunk/ppb_context_3d_thunk.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_context_3d_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-typedef EnterResource<PPB_Context3D_API> EnterContext3D;
-
-PP_Resource Create(PP_Instance instance,
-                   PP_Config3D_Dev config,
-                   PP_Resource share_context,
-                   const int32_t* attrib_list) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateContext3D(instance, config, share_context,
-                                            attrib_list);
-}
-
-PP_Bool IsContext3D(PP_Resource resource) {
-  EnterContext3D enter(resource, false);
-  return PP_FromBool(enter.succeeded());
-}
-
-int32_t GetAttrib(PP_Resource context, int32_t attribute, int32_t* value) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.object()->GetAttrib(attribute, value);
-}
-
-int32_t BindSurfaces(PP_Resource context, PP_Resource draw, PP_Resource read) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.object()->BindSurfaces(draw, read);
-}
-
-int32_t GetBoundSurfaces(PP_Resource context,
-                         PP_Resource* draw,
-                         PP_Resource* read) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.object()->GetBoundSurfaces(draw, read);
-}
-
-const PPB_Context3D_Dev g_ppb_context_3d_thunk = {
-  &Create,
-  &IsContext3D,
-  &GetAttrib,
-  &BindSurfaces,
-  &GetBoundSurfaces
-};
-
-}  // namespace
-
-const PPB_Context3D_Dev* GetPPB_Context3D_Dev_Thunk() {
-  return &g_ppb_context_3d_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/ppb_context_3d_trusted_thunk.cc b/ppapi/thunk/ppb_context_3d_trusted_thunk.cc
deleted file mode 100644
index 312898a..0000000
--- a/ppapi/thunk/ppb_context_3d_trusted_thunk.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_context_3d_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-typedef EnterResource<PPB_Context3D_API> EnterContext3D;
-
-PP_Context3DTrustedState GetErrorState() {
-  PP_Context3DTrustedState error_state = { 0 };
-  error_state.error = kGenericError;
-  return error_state;
-}
-
-PP_Resource CreateRaw(PP_Instance instance,
-                      PP_Config3D_Dev config,
-                      PP_Resource share_context,
-                      const int32_t* attrib_list) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateContext3DRaw(instance, config, share_context,
-                                               attrib_list);
-}
-
-PP_Bool Initialize(PP_Resource context, int32_t size) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->InitializeTrusted(size);
-}
-
-PP_Bool GetRingBuffer(PP_Resource context,
-                      int* shm_handle,
-                      uint32_t* shm_size) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->GetRingBuffer(shm_handle, shm_size);
-}
-
-PP_Context3DTrustedState GetState(PP_Resource context) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return GetErrorState();
-  return enter.object()->GetState();
-}
-
-PP_Bool Flush(PP_Resource context, int32_t put_offset) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->Flush(put_offset);
-}
-
-PP_Context3DTrustedState FlushSync(PP_Resource context, int32_t put_offset) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return GetErrorState();
-  return enter.object()->FlushSync(put_offset);
-}
-
-int32_t CreateTransferBuffer(PP_Resource context, uint32_t size) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->CreateTransferBuffer(size);
-}
-
-PP_Bool DestroyTransferBuffer(PP_Resource context, int32_t id) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->DestroyTransferBuffer(id);
-}
-
-PP_Bool GetTransferBuffer(PP_Resource context,
-                          int32_t id,
-                          int* shm_handle,
-                          uint32_t* shm_size) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->GetTransferBuffer(id, shm_handle, shm_size);
-}
-
-PP_Context3DTrustedState FlushSyncFast(PP_Resource context,
-                                       int32_t put_offset,
-                                       int32_t last_known_get) {
-  EnterContext3D enter(context, true);
-  if (enter.failed())
-    return GetErrorState();
-  return enter.object()->FlushSyncFast(put_offset, last_known_get);
-}
-
-const PPB_Context3DTrusted_Dev g_ppb_context_3d_trusted_thunk = {
-  &CreateRaw,
-  &Initialize,
-  &GetRingBuffer,
-  &GetState,
-  &Flush,
-  &FlushSync,
-  &CreateTransferBuffer,
-  &DestroyTransferBuffer,
-  &GetTransferBuffer,
-  &FlushSyncFast,
-};
-
-}  // namespace
-
-const PPB_Context3DTrusted_Dev* GetPPB_Context3DTrusted_Thunk() {
-  return &g_ppb_context_3d_trusted_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
index 085578a..0963631f7 100644
--- a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
+++ b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_context_3d_api.h"
 #include "ppapi/thunk/ppb_graphics_3d_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
@@ -13,7 +12,6 @@ namespace thunk {
 
 namespace {
 
-typedef EnterResource<PPB_Context3D_API> EnterContext3D;
 typedef EnterResource<PPB_Graphics3D_API> EnterGraphics3D;
 
 void* MapTexSubImage2DCHROMIUM(PP_Resource context,
@@ -26,38 +24,18 @@ void* MapTexSubImage2DCHROMIUM(PP_Resource context,
                                GLenum format,
                                GLenum type,
                                GLenum access) {
-  {
-    EnterContext3D enter(context, false);
-    if (enter.succeeded()) {
-      return enter.object()->MapTexSubImage2DCHROMIUM(
-          target, level, xoffset, yoffset, width, height, format, type, access);
-    }
-  }
-  {
-    EnterGraphics3D enter(context, true);
-    if (enter.succeeded()) {
-      return enter.object()->MapTexSubImage2DCHROMIUM(
-          target, level, xoffset, yoffset, width, height, format, type, access);
-    }
+  EnterGraphics3D enter(context, true);
+  if (enter.succeeded()) {
+    return enter.object()->MapTexSubImage2DCHROMIUM(
+        target, level, xoffset, yoffset, width, height, format, type, access);
   }
   return NULL;
 }
 
 void UnmapTexSubImage2DCHROMIUM(PP_Resource context, const void* mem) {
-  {
-    EnterContext3D enter(context, false);
-    if (enter.succeeded()) {
-      enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
-      return;
-    }
-  }
-  {
-    EnterGraphics3D enter(context, true);
-    if (enter.succeeded()) {
-      enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
-      return;
-    }
-  }
+  EnterGraphics3D enter(context, true);
+  if (enter.succeeded())
+    enter.object()->UnmapTexSubImage2DCHROMIUM(mem);
 }
 
 const PPB_GLESChromiumTextureMapping_Dev
diff --git a/ppapi/thunk/ppb_surface_3d_api.h b/ppapi/thunk/ppb_surface_3d_api.h
deleted file mode 100644
index 2c905f5..0000000
--- a/ppapi/thunk/ppb_surface_3d_api.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_PPB_SURFACE_3D_API_H_
-#define PPAPI_THUNK_PPB_SURFACE_3D_API_H_
-
-#include "ppapi/c/dev/ppb_surface_3d_dev.h"
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_Surface3D_API {
- public:
-  virtual ~PPB_Surface3D_API() {}
-
-  virtual int32_t SetAttrib(int32_t attribute, int32_t value) = 0;
-  virtual int32_t GetAttrib(int32_t attribute, int32_t* value) = 0;
-  virtual int32_t SwapBuffers(PP_CompletionCallback callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_SURFACE_3D_API_H_
diff --git a/ppapi/thunk/ppb_surface_3d_thunk.cc b/ppapi/thunk/ppb_surface_3d_thunk.cc
deleted file mode 100644
index ba1df6f..0000000
--- a/ppapi/thunk/ppb_surface_3d_thunk.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/thunk/common.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/ppb_surface_3d_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Resource Create(PP_Instance instance,
-                   PP_Config3D_Dev config,
-                   const int32_t* attrib_list) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateSurface3D(instance, config, attrib_list);
-}
-
-PP_Bool IsSurface3D(PP_Resource resource) {
-  EnterResource<PPB_Surface3D_API> enter(resource, true);
-  return PP_FromBool(enter.succeeded());
-}
-
-int32_t SetAttrib(PP_Resource surface, int32_t attribute, int32_t value) {
-  EnterResource<PPB_Surface3D_API> enter(surface, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.object()->SetAttrib(attribute, value);
-}
-
-int32_t GetAttrib(PP_Resource surface,
-                  int32_t attribute,
-                  int32_t* value) {
-  EnterResource<PPB_Surface3D_API> enter(surface, true);
-  if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
-  return enter.object()->GetAttrib(attribute, value);
-}
-
-int32_t SwapBuffers(PP_Resource surface,
-                    PP_CompletionCallback callback) {
-  EnterResource<PPB_Surface3D_API> enter(surface, true);
-  if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->SwapBuffers(callback);
-  return MayForceCallback(callback, result);
-}
-
-const PPB_Surface3D_Dev g_ppb_surface_3d_thunk = {
-  &Create,
-  &IsSurface3D,
-  &SetAttrib,
-  &GetAttrib,
-  &SwapBuffers
-};
-
-}  // namespace
-
-const PPB_Surface3D_Dev* GetPPB_Surface3D_Dev_Thunk() {
-  return &g_ppb_surface_3d_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc
index 40b837b..e1962cd 100644
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc
+++ b/ppapi/thunk/ppb_video_decoder_thunk.cc
@@ -17,12 +17,12 @@ namespace {
 typedef EnterResource<PPB_VideoDecoder_API> EnterVideoDecoder;
 
 PP_Resource Create(PP_Instance instance,
-                   PP_Resource context_3d,
+                   PP_Resource graphics_3d,
                    PP_VideoDecoder_Profile profile) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return 0;
-  return enter.functions()->CreateVideoDecoder(instance, context_3d, profile);
+  return enter.functions()->CreateVideoDecoder(instance, graphics_3d, profile);
 }
 
 PP_Bool IsVideoDecoder(PP_Resource resource) {
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index 24a58c6..ecab7cd 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -57,14 +57,6 @@ class ResourceCreationAPI {
   virtual PP_Resource CreateAudioInputTrusted(PP_Instance instance) = 0;
   virtual PP_Resource CreateBroker(PP_Instance instance) = 0;
   virtual PP_Resource CreateBuffer(PP_Instance instance, uint32_t size) = 0;
-  virtual PP_Resource CreateContext3D(PP_Instance instance,
-                                      PP_Config3D_Dev config,
-                                      PP_Resource share_context,
-                                      const int32_t* attrib_list) = 0;
-  virtual PP_Resource CreateContext3DRaw(PP_Instance instance,
-                                         PP_Config3D_Dev config,
-                                         PP_Resource share_context,
-                                         const int32_t* attrib_list) = 0;
   virtual PP_Resource CreateDirectoryReader(PP_Resource directory_ref) = 0;
   virtual PP_Resource CreateFileChooser(
       PP_Instance instance,
@@ -113,9 +105,6 @@ class ResourceCreationAPI {
       const PP_Point* mouse_movement) = 0;
   virtual PP_Resource CreateScrollbar(PP_Instance instance,
                                       PP_Bool vertical) = 0;
-  virtual PP_Resource CreateSurface3D(PP_Instance instance,
-                                      PP_Config3D_Dev config,
-                                      const int32_t* attrib_list) = 0;
   virtual PP_Resource CreateTCPSocketPrivate(PP_Instance instace) = 0;
   virtual PP_Resource CreateTransport(PP_Instance instance,
                                       const char* name,
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index 5fb38b4..9d1080e 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -31,7 +31,6 @@ struct PPB_AudioInputTrusted_Dev;
 struct PPB_AudioTrusted;
 struct PPB_BrokerTrusted;
 struct PPB_BufferTrusted;
-struct PPB_Context3DTrusted_Dev;
 struct PPB_FileChooserTrusted;
 struct PPB_FileIOTrusted;
 struct PPB_FileRefPrivate;
@@ -59,8 +58,6 @@ PPAPI_THUNK_EXPORT const PPB_AudioInputTrusted_Dev*
 PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk();
 PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Context3DTrusted_Dev*
-    GetPPB_Context3DTrusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted*
     GetPPB_FileChooser_Trusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk();