diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 22:26:39 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-22 22:26:39 +0000 |
| commit | c015c1490c73a5ae060464ddb64219c5c29f814b (patch) | |
| tree | 7e1116800179447c7b739493435ce03d96e1b76f /chrome/browser/gpu | |
| parent | 8a4677ed7ace8b86c3b09eae39375210c255c3e6 (diff) | |
| download | chromium_src-c015c1490c73a5ae060464ddb64219c5c29f814b.zip chromium_src-c015c1490c73a5ae060464ddb64219c5c29f814b.tar.gz chromium_src-c015c1490c73a5ae060464ddb64219c5c29f814b.tar.bz2 | |
Always enable FCM on Windows.
This also 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 is a stepping stone towards getting the waterfall closer to what we actually ship and closer to Aura; I will try to force threaded compositing next provided this goes well.
This CL also cleans up compositor_util.cc which was enforcing the blacklist twice.
Instead of keeping --skip-gpu-data-loading around to avoid regressing issue 190942, introduce a better global solution which involves initializing a fake gpu_info in GpuDataManagerImplPrivate::Initialize instead of querying real gpu_info (slow) when OSMesa is the GL being used (which it is in non-pure GPU tests).
Keeps --skip-gpu-data-loading around temporarily on Mac and Linux, see http://crbug.com/277242 and try failures on patch set 17 for details.
BUG=233830, 267038, 190942, 277242
TBR=jcivelli, piman
Review URL: https://chromiumcodereview.appspot.com/22198004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu')
| -rw-r--r-- | chrome/browser/gpu/chrome_gpu_util.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/gpu/chrome_gpu_util.cc b/chrome/browser/gpu/chrome_gpu_util.cc index 61da773..4bbd5e5 100644 --- a/chrome/browser/gpu/chrome_gpu_util.cc +++ b/chrome/browser/gpu/chrome_gpu_util.cc @@ -40,18 +40,6 @@ bool ShouldRunCompositingFieldTrial() { return false; #endif -// Necessary for linux_chromeos build since it defines both OS_LINUX -// and OS_CHROMEOS. -#if defined(OS_CHROMEOS) - return false; -#endif - -#if defined(OS_WIN) - // Don't run the trial on Windows XP. - if (base::win::GetVersion() < base::win::VERSION_VISTA) - return false; -#endif - #if defined(OS_MACOSX) // Browser and content shell tests hang on 10.7 when the Apple software // renderer is used. These tests ignore the blacklist (which disables |