Prepare Chromium for WebCompositor::initialize.

ui/gfx/compositor/compositor_cc.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 "ui/gfx/compositor/compositor_cc.h"
 
 #include "third_party/skia/include/images/SkImageEncoder.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h"
@@ skipping 116 matching lines @@
   WebKit::WebLayerTreeView::Settings settings;
   settings.enableCompositorThread = !!g_compositor_thread;
   host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings);
   root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
   OnWidgetSizeChanged();
 }
 
 CompositorCC::~CompositorCC() {
 }
 
-void CompositorCC::InitializeThread() {
-  g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
-  WebKit::WebCompositor::setThread(g_compositor_thread);
+void CompositorCC::Initialize(bool use_thread) {
+  if (use_thread)
+    g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
+#if WEBCOMPOSITOR_HAS_INITIALIZE
+  WebKit::WebCompositor::initialize(g_compositor_thread);
+#else
+  if (use_thread)
+    WebKit::WebCompositor::setThread(g_compositor_thread);
+#endif
 }
 
-void CompositorCC::TerminateThread() {
+void CompositorCC::Terminate() {
+#if WEBCOMPOSITOR_HAS_INITIALIZE
+  WebKit::WebCompositor::shutdown();
+#endif
   DCHECK(g_compositor_thread);

[piman, 2011/11/18 23:21:56]

remove DCHECK, since it'll fail if use_thread == false.

   delete g_compositor_thread;
   g_compositor_thread = NULL;
 }
 
 Texture* CompositorCC::CreateTexture() {
   NOTREACHED();
   return NULL;
 }
 
 void CompositorCC::Blur(const gfx::Rect& bounds) {
@@ skipping 72 matching lines @@
   ScheduleDraw();
 }
 
 Compositor* Compositor::Create(CompositorDelegate* owner,
                                gfx::AcceleratedWidget widget,
                                const gfx::Size& size) {
   return new CompositorCC(owner, widget, size);
 }
 
 }  // namespace ui