summaryrefslogtreecommitdiffstats
path: root/ppapi/ppapi_cpp.gypi
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 17:10:46 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-07 17:10:46 +0000
commitfae0e947dd72d6499abcd4cc9d8a2c988802ecc7 (patch)
tree64894d705184fa15943381a1a083cd4a82e242a0 /ppapi/ppapi_cpp.gypi
parent29ee58a0ca74da203815ffc416e0b52cafb9c79e (diff)
downloadchromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.zip
chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.gz
chromium_src-fae0e947dd72d6499abcd4cc9d8a2c988802ecc7.tar.bz2
reconstitute moving 3d out of dev CL. (previous attempt was reverted)
previous CL: http://codereview.chromium.org/7737013/ BUG= http://code.google.com/p/chromium/issues/detail?id=94320 TEST= try bots, manual testing Review URL: http://codereview.chromium.org/7837018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_cpp.gypi')
-rw-r--r--ppapi/ppapi_cpp.gypi18
1 files changed, 9 insertions, 9 deletions
diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi
index 42cfece..3c01319 100644
--- a/ppapi/ppapi_cpp.gypi
+++ b/ppapi/ppapi_cpp.gypi
@@ -17,6 +17,7 @@
'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',
@@ -36,22 +37,24 @@
'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',
'c/ppb_var.h',
'c/ppp.h',
+ 'c/ppp_graphics_3d.h',
'c/ppp_input_event.h',
'c/ppp_instance.h',
'c/ppp_messaging.h',
# 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',
@@ -64,10 +67,7 @@
'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',
@@ -78,7 +78,6 @@
'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',
@@ -112,6 +111,7 @@
'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',
@@ -150,6 +150,10 @@
'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',
@@ -197,10 +201,6 @@
'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',