Prepare Chromium for WebCompositor::initialize.

webkit/glue/webpreferences.cc

Index: webkit/glue/webpreferences.cc
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 199c6e7d51f42b1fc51e9b758e2eb10d9d66f292..6c435bbbf2a7f3517bd8f875fb4f8fa9de161be5 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"

[tony, 2011/11/18 23:30:08]

Is this needed for this change or you're just doing it preemptively?

 #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);

[tony, 2011/11/18 23:30:08]

It feels weird to conditionally set this.  Should we conditionally be giving a
value to threaded_compositing_enabled instead?

+#endif
 
   // Always enter compositing if requested on the command line.
   settings->setForceCompositingMode(force_compositing_mode);