Chromium Code Reviews| Index: content/public/test/browser_test_base.h |
| diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h |
| index f9171bbe56a0edd9182ee6e80f428007a07e42a6..2099ff59fd4a0b69fae4a2204b7f161a6ff9c1cd 100644 |
| --- a/content/public/test/browser_test_base.h |
| +++ b/content/public/test/browser_test_base.h |
| @@ -120,11 +120,15 @@ class BrowserTestBase : public testing::Test { |
| // Call this before SetUp() to use real GL contexts in Compositor for the |
| // test. |
| - void UseRealGLContexts() { allow_test_contexts_ = false; } |
| + void UseRealGLContexts(); |
|
sky
2013/12/19 21:35:32
Can we have one setter here? Maybe SetCompositingM
danakj
2013/12/19 21:40:54
Hm, this is a good idea, thanks. I'm actually goin
|
| // Call this before SetUp() to use real GL drivers instead of OSMesa for the |
| // test. |
| - void UseRealGLBindings() { allow_osmesa_ = false; } |
| + void UseRealGLBindings(); |
| + |
| + // Call this before SetUp() to not use GL, but use software compositing |
| + // instead. |
| + void UseSoftwareCompositing(); |
| private: |
| void ProxyRunTestOnMainThreadLoop(); |
| @@ -146,6 +150,9 @@ class BrowserTestBase : public testing::Test { |
| // to run GL on the CPU in a way that works across all platforms. |
| bool allow_osmesa_; |
| + // When true, do compositing with the software backend instead of using GL. |
| + bool use_software_compositing_; |
| + |
| #if defined(OS_POSIX) |
| bool handle_sigterm_; |
| #endif |