diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
| commit | 207ff6675717b341d3c78d305762cd6d7a9888e1 (patch) | |
| tree | be0cd36338515ddc69935e6f2966f59b181d08aa /chrome/chrome_dll.gypi | |
| parent | afaf073bb190f4e3becd8e1cd60dde6324f7ae15 (diff) | |
| download | chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.zip chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.gz chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.bz2 | |
Attempt 2 at : Makes tests either use mock compositor or mock
WebGraphicsContext3D depending upon which compositor we're
running. This is needed to enable ui tests on the bots.
I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8889022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 75c0164..aa4ac07 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -16,6 +16,15 @@ 'app/policy/cloud_policy_codegen.gyp:policy', ], 'conditions': [ + ['use_webkit_compositor==1', { + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:compositor', + ], + }, { # use_webkit_compositor!=1 + 'dependencies': [ + '../ui/gfx/compositor/compositor.gyp:test_compositor', + ], + }], ['OS=="win"', { 'product_name': 'chrome', 'dependencies': [ |