Support for '--force-compositing-mode', see WebKit bug 56156

BUG=
TEST=


Review URL: http://codereview.chromium.org/6665057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78904 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 2 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index ab359a2..116d43d 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -68,6 +68,7 @@ WebPreferences::WebPreferences()
       show_fps_counter(false),
       asynchronous_spell_checking_enabled(true),
       accelerated_compositing_enabled(false),
+      force_compositing_mode(false),
       composite_to_texture_enabled(false),
       accelerated_layers_enabled(false),
       accelerated_video_enabled(false),
@@ -175,6 +176,9 @@ void WebPreferences::Apply(WebView* web_view) const {
   // Enable gpu-accelerated compositing if requested on the command line.
   settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
 
+  // Always enter compositing if requested on the command line.
+  settings->setForceCompositingMode(force_compositing_mode);
+
   // Enable composite to offscreen texture if requested on the command line.
   settings->setCompositeToTextureEnabled(composite_to_texture_enabled);
 
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 0d37d39..c373504 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -74,6 +74,7 @@ struct WebPreferences {
   bool show_fps_counter;
   bool asynchronous_spell_checking_enabled;
   bool accelerated_compositing_enabled;
+  bool force_compositing_mode;
   bool composite_to_texture_enabled;
   bool accelerated_layers_enabled;
   bool accelerated_video_enabled;