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

3 files changed, 0 insertions, 24 deletions

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
index a0f6205..868a56b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
@@ -17,11 +17,8 @@
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/plugin/plugin.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"
 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
-#include "ppapi/c/dev/ppb_surface_3d_dev.h"
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/c/ppb_opengles2.h"
 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
@@ -189,11 +186,8 @@ const void* GetBrowserInterface(const char* interface_name) {
     static const char* disabled_interface_names[] = {
       PPB_GRAPHICS_3D_INTERFACE,
       PPB_GRAPHICS_3D_TRUSTED_INTERFACE,
-      PPB_CONTEXT_3D_DEV_INTERFACE,
-      PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE,
       PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
       PPB_OPENGLES2_INTERFACE,
-      PPB_SURFACE_3D_DEV_INTERFACE,
       PPB_LAYER_COMPOSITOR_DEV_INTERFACE
     };
     for (size_t i = 0; i < NACL_ARRAY_SIZE(disabled_interface_names); i++) {
diff --git a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
index 4a2be03..8c23d1a4 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
+++ b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc
@@ -4,12 +4,10 @@
 
 #include "native_client/src/shared/platform/nacl_check.h"
 
-#include "ppapi/c/dev/ppb_context_3d_dev.h"
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
-#include "ppapi/c/dev/ppb_surface_3d_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
@@ -145,12 +143,6 @@ const PPB_WheelInputEvent* PPBWheelInputEvent() {
 
 // Dev interfaces.
 
-const PPB_Context3D_Dev* PPBContext3DDev() {
-  return reinterpret_cast<const PPB_Context3D_Dev*>(
-      // Change to GetBrowserInterfaceSafe when moving out of dev.
-      GetBrowserInterface(PPB_CONTEXT_3D_DEV_INTERFACE));
-}
-
 const PPB_CursorControl_Dev* PPBCursorControlDev() {
   return reinterpret_cast<const PPB_CursorControl_Dev*>(
       // Change to GetBrowserInterfaceSafe when moving out of dev.
@@ -175,12 +167,6 @@ const PPB_Scrollbar_Dev* PPBScrollbarDev() {
       GetBrowserInterface(PPB_SCROLLBAR_DEV_INTERFACE));
 }
 
-const PPB_Surface3D_Dev* PPBSurface3DDev() {
-  return  reinterpret_cast<const PPB_Surface3D_Dev*>(
-      // Change to GetBrowserInterfaceSafe when moving out of dev.
-      GetBrowserInterface(PPB_SURFACE_3D_DEV_INTERFACE));
-}
-
 const PPB_Testing_Dev* PPBTestingDev() {
   return  reinterpret_cast<const PPB_Testing_Dev*>(
       // Change to GetBrowserInterfaceSafe when moving out of dev.
diff --git a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h
index 9071b2a..04df592 100644
--- a/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h
+++ b/ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h
@@ -13,7 +13,6 @@
 // versions explicitly in all interfaces.
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 
-struct PPB_Context3D_Dev;
 struct PPB_Core;
 struct PPB_CursorControl_Dev;
 struct PPB_FileIO;
@@ -31,7 +30,6 @@ struct PPB_Memory_Dev;
 struct PPB_Messaging;
 struct PPB_MouseInputEvent;
 struct PPB_OpenGLES2;
-struct PPB_Surface3D_Dev;
 struct PPB_Testing_Dev;
 struct PPB_URLLoader;
 struct PPB_URLRequestInfo;
@@ -75,12 +73,10 @@ const PPB_WheelInputEvent* PPBWheelInputEvent();
 // Lookup returns NULL if the interface is not available.
 //
 
-const PPB_Context3D_Dev* PPBContext3DDev();
 const PPB_CursorControl_Dev* PPBCursorControlDev();
 const PPB_Font_Dev* PPBFontDev();
 const PPB_Memory_Dev* PPBMemoryDev();
 const PPB_Scrollbar_Dev* PPBScrollbarDev();
-const PPB_Surface3D_Dev* PPBSurface3DDev();
 const PPB_Testing_Dev* PPBTestingDev();
 const PPB_Widget_Dev* PPBWidgetDev();