Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

ppapi/ppapi_cpp.gypi

Index: ppapi/ppapi_cpp.gypi
===================================================================
--- ppapi/ppapi_cpp.gypi	(revision 99860)
+++ ppapi/ppapi_cpp.gypi	(working copy)
@@ -17,7 +17,6 @@
         'c/pp_completion_callback.h',
         'c/pp_errors.h',
         'c/pp_file_info.h',
-        'c/pp_graphics_3d.h',
         'c/pp_input_event.h',
         'c/pp_instance.h',
         'c/pp_macros.h',
@@ -37,12 +36,10 @@
         'c/ppb_file_ref.h',
         'c/ppb_file_system.h',
         'c/ppb_graphics_2d.h',
-        'c/ppb_graphics_3d.h',
         'c/ppb_image_data.h',
         'c/ppb_input_event.h',
         'c/ppb_instance.h',
         'c/ppb_messaging.h',
-        'c/ppb_opengles.h',
         'c/ppb_url_loader.h',
         'c/ppb_url_request_info.h',
         'c/ppb_url_response_info.h',
@@ -54,6 +51,7 @@
 
         # Dev interfaces.
         'c/dev/pp_cursor_type_dev.h',
+        'c/dev/pp_graphics_3d_dev.h',
         'c/dev/pp_video_dev.h',
         'c/dev/ppb_buffer_dev.h',
         'c/dev/ppb_char_set_dev.h',
@@ -66,7 +64,10 @@
         'c/dev/ppb_find_dev.h',
         'c/dev/ppb_font_dev.h',
         'c/dev/ppb_fullscreen_dev.h',
+        'c/dev/ppb_graphics_3d_dev.h',
+        'c/dev/ppb_graphics_3d_trusted_dev.h',
         'c/dev/ppb_memory_dev.h',
+        'c/dev/ppb_opengles_dev.h',
         'c/dev/ppb_query_policy_dev.h',
         'c/dev/ppb_scrollbar_dev.h',
         'c/dev/ppb_surface_3d_dev.h',
@@ -77,6 +78,7 @@
         'c/dev/ppb_zoom_dev.h',
         'c/dev/ppp_cursor_control_dev.h',
         'c/dev/ppp_find_dev.h',
+        'c/dev/ppp_graphics_3d_dev.h',
         'c/dev/ppp_network_state_dev.h',
         'c/dev/ppp_policy_update_dev.h',
         'c/dev/ppp_printing_dev.h',
@@ -110,7 +112,6 @@
         'c/trusted/ppb_broker_trusted.h',
         'c/trusted/ppb_buffer_trusted.h',
         'c/trusted/ppb_file_io_trusted.h',
-        'c/trusted/ppb_graphics_3d_trusted.h',
         'c/trusted/ppb_image_data_trusted.h',
         'c/trusted/ppb_url_loader_trusted.h',
         'c/trusted/ppp_broker.h',
@@ -149,10 +150,6 @@
         'cpp/file_system.h',
         'cpp/graphics_2d.cc',
         'cpp/graphics_2d.h',
-        'cpp/graphics_3d.cc',
-        'cpp/graphics_3d.h',
-        'cpp/graphics_3d_client.cc',
-        'cpp/graphics_3d_client.h',
         'cpp/image_data.cc',
         'cpp/image_data.h',
         'cpp/input_event.cc',
@@ -200,6 +197,10 @@
         'cpp/dev/font_dev.h',
         'cpp/dev/fullscreen_dev.cc',
         'cpp/dev/fullscreen_dev.h',
+        'cpp/dev/graphics_3d_client_dev.cc',
+        'cpp/dev/graphics_3d_client_dev.h',
+        'cpp/dev/graphics_3d_dev.cc',
+        'cpp/dev/graphics_3d_dev.h',
         'cpp/dev/memory_dev.cc',
         'cpp/dev/memory_dev.h',
         'cpp/dev/printing_dev.cc',
Property changes on: ppapi/ppapi_cpp.gypi
___________________________________________________________________
Added: svn:mergeinfo