diff options
| author | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 00:33:24 +0000 |
|---|---|---|
| committer | karen@chromium.org <karen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 00:33:24 +0000 |
| commit | b465d46a69b7d5138571043e40a803de0f99ce32 (patch) | |
| tree | 8a94ed08604a85c8c85dd9c9d54f66624d09aa14 /build | |
| parent | 4e8ee2c45974f220f1f46fbe4ca6c72aac518555 (diff) | |
| download | chromium_src-b465d46a69b7d5138571043e40a803de0f99ce32.zip chromium_src-b465d46a69b7d5138571043e40a803de0f99ce32.tar.gz chromium_src-b465d46a69b7d5138571043e40a803de0f99ce32.tar.bz2 | |
Revert 187427 "PPAPI: Remove threading options; it's always on"
> PPAPI: Remove threading options; it's always on
>
> This also re-enables thread checking for the host side resource and var trackers. Before, checking was disabled everywhere.
>
> BUG=159240,92909
>
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186925
> Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=186939 due to build errors
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187340
>
> Review URL: https://chromiumcodereview.appspot.com/12378050
TBR=dmichael@chromium.org
Review URL: https://codereview.chromium.org/12457021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index afaec38..6050224a 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -321,6 +321,11 @@ # Webrtc compilation is enabled by default. Set to 0 to disable. 'enable_webrtc%': 1, + # PPAPI by default does not support plugins making calls off the main + # thread. Set to 1 to turn on experimental support for out-of-process + # plugins to make call of the main thread. + 'enable_pepper_threading%': 1, + # Enables use of the session service, which is enabled by default. # Support for disabling depends on the platform. 'enable_session_service%': 1, @@ -668,6 +673,7 @@ 'use_x11%': '<(use_x11)', 'use_gnome_keyring%': '<(use_gnome_keyring)', 'linux_fpic%': '<(linux_fpic)', + 'enable_pepper_threading%': '<(enable_pepper_threading)', 'chromeos%': '<(chromeos)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', @@ -1764,6 +1770,9 @@ ['proprietary_codecs==1', { 'defines': ['USE_PROPRIETARY_CODECS'], }], + ['enable_pepper_threading==1', { + 'defines': ['ENABLE_PEPPER_THREADING'], + }], ['enable_viewport==1', { 'defines': ['ENABLE_VIEWPORT'], }], |