diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 21:02:15 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 21:02:15 +0000 |
| commit | d44bf9490043a884fdb7e352d4711275a546bca5 (patch) | |
| tree | 42fe8b01616eb7122dda7ccce02151c7a1d862ae /ppapi | |
| parent | 93872b09aa5a4f2b2f114f808e702b465883fd9a (diff) | |
| download | chromium_src-d44bf9490043a884fdb7e352d4711275a546bca5.zip chromium_src-d44bf9490043a884fdb7e352d4711275a546bca5.tar.gz chromium_src-d44bf9490043a884fdb7e352d4711275a546bca5.tar.bz2 | |
Fix the NaCl IPC proxy untrusted side to allow calls off the main thread.
BUG=116317
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11170006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/ppapi_ipc_proxy_untrusted.gyp | 12 | ||||
| -rw-r--r-- | ppapi/ppapi_ipc_untrusted.gyp | 12 | ||||
| -rw-r--r-- | ppapi/ppapi_shared_untrusted.gyp | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/ppapi/ppapi_ipc_proxy_untrusted.gyp b/ppapi/ppapi_ipc_proxy_untrusted.gyp index e4796b8..d2f7fa2 100644 --- a/ppapi/ppapi_ipc_proxy_untrusted.gyp +++ b/ppapi/ppapi_ipc_proxy_untrusted.gyp @@ -10,9 +10,6 @@ { 'variables': { 'chromium_code': 1, - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'enable_pepper_threading': '1', }, 'includes': [ '../build/common_untrusted.gypi', @@ -30,10 +27,13 @@ 'nlib_target': 'libppapi_proxy_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + # Enable threading for the untrusted side of the proxy. + # TODO(bbudge) remove when this is the default. + 'ENABLE_PEPPER_THREADING', + ], }, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - ], 'include_dirs': [ '..', '../third_party/khronos', diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp index ee1caaa..1f5c3c9 100644 --- a/ppapi/ppapi_ipc_untrusted.gyp +++ b/ppapi/ppapi_ipc_untrusted.gyp @@ -5,9 +5,6 @@ { 'variables': { 'chromium_code': 1, - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'enable_pepper_threading': '1', }, 'includes': [ '../native_client/build/untrusted.gypi', @@ -26,10 +23,13 @@ 'nlib_target': 'libppapi_ipc_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + # Enable threading for the untrusted side of the proxy. + # TODO(bbudge) remove when this is the default. + 'ENABLE_PEPPER_THREADING', + ], }, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - ], 'include_dirs': [ '..', ], diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index fa01207..ef76bd3 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -5,9 +5,6 @@ { 'variables': { 'chromium_code': 1, - # Enable threading for the untrusted side of the proxy. - # TODO(bbudge) remove when this is the default. - 'enable_pepper_threading': '1', }, 'includes': [ '../build/common_untrusted.gypi', @@ -26,10 +23,13 @@ 'nlib_target': 'libppapi_shared_untrusted.a', 'build_glibc': 0, 'build_newlib': 1, + 'defines': [ + 'NACL_PPAPI_IPC_PROXY', + # Enable threading for the untrusted side of the proxy. + # TODO(bbudge) remove when this is the default. + 'ENABLE_PEPPER_THREADING', + ], }, - 'defines': [ - 'NACL_PPAPI_IPC_PROXY', - ], 'include_dirs': [ '..', '../third_party/khronos', |