diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 20:23:48 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 20:23:48 +0000 |
| commit | 9e0e87c8999e686676eddf4e64798eb758f6ee21 (patch) | |
| tree | 4faae222007cf73c599887180b78a2f15af8c5aa /content/browser/gpu/gpu_data_manager_impl_private.h | |
| parent | e99cb82d8b930141da62628024dd5f5f7e9536ce (diff) | |
| download | chromium_src-9e0e87c8999e686676eddf4e64798eb758f6ee21.zip chromium_src-9e0e87c8999e686676eddf4e64798eb758f6ee21.tar.gz chromium_src-9e0e87c8999e686676eddf4e64798eb758f6ee21.tar.bz2 | |
Enable GPU blacklist in tests.
Partial re-land of https://codereview.chromium.org/22198004/) -- Always enable FCM on Windows -- Part 1/3.
On top of fixing some of the issues there; only lands the part that enables the GPU blacklist in tests as the former CL is too hard to land all at once.
Also keeping --skip-gpu-data-loading around for now to be able to deal with failures caused in layout_tests by this on their own later (this needs to land ASAP and layout_tests don't need this ASAP).
Another CL will follow to always enable FCM on non-blacklisted Windows machines.
This part re-enables loading the blacklist in tests (and adds a content_browsertest to make sure that the configuration we expect to be testing is indeed the one we are testing -- this uncertainty is basically the only reason the blacklist was explicitly disabled before).
This CL also cleans up compositor_util.cc which was enforcing the blacklist twice.
The original plan was to do this only for Windows as Mac/Linux was causing trouble, but it turns out to be harder to do it only on Windows; so taking care of http://crbug.com/277242 in this CL too after all...
BUG=233830, 267038, 190942, 277242
TBR=jcivelli, piman
Originally Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219132
Then Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=219159
Then re-committed (part 1/3): https://src.chromium.org/viewvc/chrome?view=rev&revision=221114
Reverted in: https://src.chromium.org/viewvc/chrome?view=rev&revision=221145
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222105
Review URL: https://chromiumcodereview.appspot.com/23534006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager_impl_private.h')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl_private.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h index 8d15296..ed1b39c 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.h +++ b/content/browser/gpu/gpu_data_manager_impl_private.h @@ -247,6 +247,9 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool use_software_compositor_; + // True if all future Initialize calls should be ignored. + bool finalized_; + DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImplPrivate); }; |