Use WebCompositorSupport for ui/compositor initialization and shutdown

ui/compositor/compositor.cc

 // Copyright (c) 2012 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/compositor/compositor.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/threading/thread_restrictions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/images/SkImageEncoder.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorOutputSurface.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/test_web_graphics_context_3d.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "webkit/glue/webthread_impl.h"
@@ skipping 143 matching lines @@
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   if (!test_compositor_enabled)
     ContextFactory::GetInstance()->RemoveCompositor(this);
 }
 
 void Compositor::Initialize(bool use_thread) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
+  WebKit::WebCompositorSupport* compositor_support =
+      WebKit::Platform::current()->compositorSupport();
   // These settings must be applied before we initialize the compositor.
-  WebKit::WebCompositor::setPartialSwapEnabled(
+  compositor_support->setPartialSwapEnabled(
       command_line->HasSwitch(switches::kUIEnablePartialSwap));
-  WebKit::WebCompositor::setPerTilePaintingEnabled(
+  compositor_support->setPerTilePaintingEnabled(
       command_line->HasSwitch(switches::kUIEnablePerTilePainting));
   if (use_thread)
     g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
-  WebKit::WebCompositor::initialize(g_compositor_thread);
+  compositor_support->initialize(g_compositor_thread);
 }
 
 void Compositor::Terminate() {
-  WebKit::WebCompositor::shutdown();
+  WebKit::Platform::current()->compositorSupport()->shutdown();
   if (g_compositor_thread) {
     delete g_compositor_thread;
     g_compositor_thread = NULL;
   }
 }
 
 void Compositor::ScheduleDraw() {
   if (g_compositor_thread) {
     // TODO(nduca): Temporary while compositor calls
     // compositeImmediately() directly.
@@ skipping 251 matching lines @@
     test_compositor_enabled = true;
   }
 #if defined(OS_CHROMEOS)
   // If the test is running on the chromeos envrionment (such as
   // device or vm bots), use the real compositor.
   if (base::chromeos::IsRunningOnChromeOS())
     test_compositor_enabled = false;
 #endif
 }
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {

[Nico, 2012/09/11 06:36:04]

drive-by nit: we don't usually have _EXPORT macros at the cc file defintions;
usually it's only in the .h files.

   test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return test_compositor_enabled;
 }
 
 }  // namespace ui