Index: chrome/browser/gpu_util.cc |
=================================================================== |
--- chrome/browser/gpu_util.cc (revision 140632) |
+++ chrome/browser/gpu_util.cc (working copy) |
@@ -14,6 +14,7 @@ |
#include "base/sys_info.h" |
#include "base/values.h" |
#include "base/version.h" |
+#include "chrome/browser/chrome_browser_main.h" |
#include "chrome/browser/gpu_blacklist.h" |
#include "content/public/browser/gpu_data_manager.h" |
#include "content/public/common/content_switches.h" |
@@ -314,8 +315,9 @@ |
(!CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kDisableThreadedCompositing)); |
if (kGpuFeatureInfo[i].name == "compositing" && |
- CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kForceCompositingMode)) |
+ (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kForceCompositingMode) || |
+ ChromeBrowserMainParts::in_force_compositing_mode_trial())) |
status += "_force"; |
if (kGpuFeatureInfo[i].name == "compositing" && |
has_thread) |