Prepare Chromium for WebCompositor::initialize.

webkit/glue/webpreferences.cc

 // 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.
 
 #include "webkit/glue/webpreferences.h"
 
 #include <unicode/uchar.h>
 
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSettings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebNetworkStateNotifier;
@@ skipping 230 matching lines @@
   // Display an FPS indicator if requested on the command line.
   settings->setShowFPSCounter(show_fps_counter);
 
   // Display the current compositor tree as overlay if requested on
   // the command line
   settings->setShowPlatformLayerTree(show_composited_layer_tree);
 
   // 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);
 
   // Enable composite to offscreen texture if requested on the command line.
   settings->setCompositeToTextureEnabled(composite_to_texture_enabled);
 
   // Enable compositing for fixed position elements if requested
   // on the command line.
   settings->setAcceleratedCompositingForFixedPositionEnabled(
@@ skipping 44 matching lines @@
   settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
   settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
   settings->setShouldPrintBackgrounds(should_print_backgrounds);
   settings->setEnableScrollAnimator(enable_scroll_animator);
   settings->setHixie76WebSocketProtocolEnabled(
       hixie76_websocket_protocol_enabled);
   settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }