Prepare compositor.cc for global CCSettings
All compositor settings are currently owned by the layer tree hosts. Some of these settings will become globals. This cl prepares for that change.
BUG=131792,129683
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10534017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141410 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c0eb8664..9c73981 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -66,6 +66,7 @@
#include "net/base/net_util.h"
#include "net/base/network_change_notifier.h"
#include "net/url_request/url_request_context_getter.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/base/layout.h"
#include "ui/base/ui_base_switches.h"
@@ -464,8 +465,6 @@
!command_line.HasSwitch(switches::kDisableAccelerated2dCanvas);
prefs.deferred_2d_canvas_enabled =
!command_line.HasSwitch(switches::kDisableDeferred2dCanvas);
- prefs.threaded_animation_enabled =
- !command_line.HasSwitch(switches::kDisableThreadedAnimation);
prefs.accelerated_painting_enabled =
GpuProcessHost::gpu_enabled() &&
command_line.HasSwitch(switches::kEnableAcceleratedPainting);
@@ -479,8 +478,6 @@
!command_line.HasSwitch(switches::kDisableAcceleratedPlugins);
prefs.accelerated_video_enabled =
!command_line.HasSwitch(switches::kDisableAcceleratedVideo);
- prefs.partial_swap_enabled =
- command_line.HasSwitch(switches::kEnablePartialSwap);
prefs.interactive_form_validation_enabled =
!command_line.HasSwitch(switches::kDisableInteractiveFormValidation);
prefs.fullscreen_enabled =
@@ -506,8 +503,6 @@
prefs.visual_word_movement_enabled =
command_line.HasSwitch(switches::kEnableVisualWordMovement);
- prefs.per_tile_painting_enabled =
- command_line.HasSwitch(switches::kEnablePerTilePainting);
{ // Certain GPU features might have been blacklisted.
GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
@@ -555,6 +550,15 @@
prefs.accelerated_2d_canvas_enabled = false;
}
+#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
+ prefs.threaded_animation_enabled =
+ !command_line.HasSwitch(switches::kDisableThreadedAnimation);
+ prefs.per_tile_painting_enabled =
+ command_line.HasSwitch(switches::kEnablePerTilePainting);
+ prefs.partial_swap_enabled =
+ command_line.HasSwitch(switches::kEnablePartialSwap);
+#endif
+
if (command_line.HasSwitch(switches::kDefaultTileWidth))
prefs.default_tile_width =
GetSwitchValueAsInt(command_line, switches::kDefaultTileWidth, 1);
