diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 22:21:59 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 22:21:59 +0000 |
| commit | 11f515acdda3473200ff0cc4106a0020a7d4dc74 (patch) | |
| tree | cdfd9713928d6f0fa73b5cd7bedbd965fc93e329 /ppapi/ppapi_proxy.gypi | |
| parent | f60d96e82acd547ac834b93cd68865b66ab5b4da (diff) | |
| download | chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.zip chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.tar.gz chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.tar.bz2 | |
New file chooser interface that uses the new PP_ArrayOutput feature. This also changes PP_ArrayOutput to be pass-by-value.
This keeps backwards compat for the old interface. It fixes some bugs in the callback system that I found when working on the patch and adds some new machinery for doing array output in the proxy. It also re-enables the file chooser feature which was recently broken.
BUG=118857
Review URL: https://chromiumcodereview.appspot.com/9728001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_proxy.gypi')
| -rw-r--r-- | ppapi/ppapi_proxy.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi index 84913e0..17850f1 100644 --- a/ppapi/ppapi_proxy.gypi +++ b/ppapi/ppapi_proxy.gypi @@ -28,6 +28,15 @@ '../..', # For nacl includes to work. ], 'sources': [ + # Take some standalong files from the C++ wrapper allowing us to more + # easily make async callbacks in the proxy. We can't depend on the + # full C++ wrappers at this layer since the C++ wrappers expect + # symbols defining the globals for "being a plugin" which we are not. + # These callback files are standalone. + 'cpp/completion_callback.cc', + 'cpp/completion_callback.h', + 'utility/completion_callback_factory.h', + 'proxy/broker_dispatcher.cc', 'proxy/broker_dispatcher.h', 'proxy/dispatcher.cc', @@ -151,6 +160,8 @@ 'proxy/ppp_text_input_proxy.h', 'proxy/ppp_video_decoder_proxy.cc', 'proxy/ppp_video_decoder_proxy.h', + 'proxy/proxy_array_output.cc', + 'proxy/proxy_array_output.h', 'proxy/proxy_channel.cc', 'proxy/proxy_channel.h', 'proxy/proxy_module.cc', |