summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 00:19:08 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 00:19:08 +0000
commit028217e8744adf6d30460d1e1a512aa044e8aeea (patch)
tree481e477bdffd0531d702a84c2520e69135f124b5 /webkit
parent679f9f3e5f2232697d65d61254b0fb31f7c11d13 (diff)
downloadchromium_src-028217e8744adf6d30460d1e1a512aa044e8aeea.zip
chromium_src-028217e8744adf6d30460d1e1a512aa044e8aeea.tar.gz
chromium_src-028217e8744adf6d30460d1e1a512aa044e8aeea.tar.bz2
Prepare Chromium for WebCompositor::initialize.
Currently, we have two duplicate mechanisms for telling the compositor to go into threaded mode. First, you set WebCompositor::setThread, then you pass enableCompositorThread via WebPreferences. We're moving to a global initialize/shutdown flow on the compositor. This is a breaking change on the WebKit API so this change prepares us for it. Review URL: http://codereview.chromium.org/8558030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 199c6e7..6c435bb 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -8,6 +8,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
@@ -258,7 +259,9 @@ void WebPreferences::Apply(WebView* web_view) const {
// Enable gpu-accelerated compositing if requested on the command line.
settings->setAcceleratedCompositingEnabled(accelerated_compositing_enabled);
+#ifndef WEBCOMPOSITOR_HAS_INITIALIZE
settings->setUseThreadedCompositor(threaded_compositing_enabled);
+#endif
// Always enter compositing if requested on the command line.
settings->setForceCompositingMode(force_compositing_mode);