Use WebCompositorSupport instead of static functions in compositor_impl_android.cc

content/browser/renderer_host/compositor_impl_android.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 "content/browser/renderer_host/compositor_impl_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/browser/android/graphics_context.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.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/WebCompositorOutputSurface.h"
 
 namespace {
 
 // Adapts a pure WebGraphicsContext3D into a WebCompositorOutputSurface.
 class WebGraphicsContextToOutputSurfaceAdapter :
     public WebKit::WebCompositorOutputSurface {
 public:
     explicit WebGraphicsContextToOutputSurfaceAdapter(
         WebKit::WebGraphicsContext3D* context)
@@ skipping 37 matching lines @@
 
 namespace content {
 
 // static
 Compositor* Compositor::Create() {
   return new CompositorImpl();
 }
 
 // static
 void Compositor::Initialize() {
-  WebKit::WebCompositor::initialize(NULL);
+  WebKit::Platform::current()->compositorSupport()->initialize(NULL);
 }
 
-CompositorImpl::CompositorImpl()
-    : root_layer_(WebKit::WebLayer::create()) {
+CompositorImpl::CompositorImpl() {
+  root_layer_.reset(
+      WebKit::Platform::current()->compositorSupport()->createLayer());
 }
 
 CompositorImpl::~CompositorImpl() {
 }
 
 void CompositorImpl::OnSurfaceUpdated(
     const SurfacePresentedCallback& callback) {
   host_->composite();
   uint32 sync_point = context_->InsertSyncPoint();
   callback.Run(sync_point);
 }
 
 void CompositorImpl::SetRootLayer(WebKit::WebLayer* root_layer) {
   root_layer_->removeAllChildren();
   root_layer_->addChild(root_layer);
 }
 
 void CompositorImpl::SetWindowSurface(ANativeWindow* window) {
   if (window) {
     context_.reset(GraphicsContext::CreateForUI(window));
     WebKit::WebLayerTreeView::Settings settings;
     settings.refreshRate = 60.0;
-    host_.reset(WebKit::WebLayerTreeView::create(this, *root_layer_, settings));
+    WebKit::WebCompositorSupport* compositor_support =
+        WebKit::Platform::current()->compositorSupport();
+    host_.reset(
+        compositor_support->createLayerTreeView(this, *root_layer_, settings));
     host_->setVisible(true);
     host_->setSurfaceReady();
   } else {
     context_.reset(NULL);
     size_ = gfx::Size();
   }
 }
 
 void CompositorImpl::SetWindowBounds(const gfx::Size& size) {
   if (size_ == size)
@@ skipping 49 matching lines @@
 void CompositorImpl::didCommitAndDrawFrame() {
 }
 
 void CompositorImpl::didCompleteSwapBuffers() {
 }
 
 void CompositorImpl::scheduleComposite() {
 }
 
 } // namespace content