diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 23:30:11 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-08 23:30:11 +0000 |
| commit | 7f801d827de060e0bb88e266e6aa889ba3e14289 (patch) | |
| tree | ce099bd5fe4f4453264737e75aac0e47507bef1a /build | |
| parent | c3cda1877dbcd1b56410bd4f1c2c862bbfc40b9d (diff) | |
| download | chromium_src-7f801d827de060e0bb88e266e6aa889ba3e14289.zip chromium_src-7f801d827de060e0bb88e266e6aa889ba3e14289.tar.gz chromium_src-7f801d827de060e0bb88e266e6aa889ba3e14289.tar.bz2 | |
Reland http://codereview.chromium.org/7312008/
The only difference is I clear modifiers in Scrollbar test, and leave it enabled.
Unrevert ppapi_tests change:
Porting ppapi_tests framework to postMessage. Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl.
BUG=82606
TEST=these tests.
Review URL: http://codereview.chromium.org/7237056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91912 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 00a94d9..c2c56cc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -348,6 +348,11 @@ # but that doesn't work as we'd like. 'msvs_debug_link_incremental%': '2', + # TODO(dmichael): eliminate this when possible. + # This flag, when 0, makes ppapi build without synchronous scripting + # support in public interfaces. This is a temporary transitional option. + 'pepper_scripting%': 1, + # Needed for some of the largest modules. 'msvs_debug_link_nonincremental%': '1', @@ -718,6 +723,10 @@ ['enable_flapper_hacks==1', { 'defines': ['ENABLE_FLAPPER_HACKS=1'], }], + ['pepper_scripting==0', { + 'defines': ['PPAPI_INSTANCE_REMOVE_SCRIPTING', + 'PPAPI_VAR_REMOVE_SCRIPTING'], + }], ['fastbuild!=0', { 'conditions': [ # For Windows, we don't genererate debug information. |