blimp: Move BlimpCompositor to use delegated rendering.

blimp/client/app/android/blimp_compositor_manager_android.cc

 // Copyright 2015 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 "blimp/client/app/android/blimp_compositor_manager_android.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
 // The minimum valid content width in a tile.  This is used to make sure the
 // width of the content on the rightmost tile isn't a tiny sliver.
 const int kMinimumTileContentWidthPixels = 64;
 }
 
 namespace blimp {
 namespace client {
 
 // static
 std::unique_ptr<BlimpCompositorManagerAndroid>
 BlimpCompositorManagerAndroid::Create(
     const gfx::Size& real_size,
     const gfx::Size& size,
     RenderWidgetFeature* render_widget_feature,
-    BlimpCompositorManagerClient* client) {
+    cc::SurfaceManager* surface_manager,
+    BlimpGpuMemoryBufferManager* gpu_memory_buffer_manager,
+    SurfaceIdAllocationCallback callback) {
   gfx::Size device_size(real_size);
   bool real_size_supported = true;
   if (device_size.IsEmpty()) {
     real_size_supported = false;
     device_size = size;
   }
   return base::WrapUnique(new BlimpCompositorManagerAndroid(
-      device_size, real_size_supported, render_widget_feature, client));
+      device_size, real_size_supported, render_widget_feature, surface_manager,
+      gpu_memory_buffer_manager, callback));
 }
 
 BlimpCompositorManagerAndroid::BlimpCompositorManagerAndroid(
     const gfx::Size& size,
     bool real_size_supported,
     RenderWidgetFeature* render_widget_feature,
-    BlimpCompositorManagerClient* client)
-    : BlimpCompositorManager(render_widget_feature, client),
+    cc::SurfaceManager* surface_manager,
+    BlimpGpuMemoryBufferManager* gpu_memory_buffer_manager,
+    SurfaceIdAllocationCallback callback)
+    : BlimpCompositorManager(render_widget_feature,
+                             surface_manager,
+                             gpu_memory_buffer_manager,
+                             callback),
       portrait_width_(std::min(size.width(), size.height())),
       landscape_width_(std::max(size.width(), size.height())),
       real_size_supported_(real_size_supported) {}
 
 BlimpCompositorManagerAndroid::~BlimpCompositorManagerAndroid() {}
 
 void BlimpCompositorManagerAndroid::GenerateLayerTreeSettings(
     cc::LayerTreeSettings* settings) {
   BlimpCompositorManager::GenerateLayerTreeSettings(settings);
 
@@ skipping 34 matching lines @@
     if (numTiles > 16)
       default_tile_size = 384;
     if (numTiles >= 40)
       default_tile_size = 512;
   }
   settings->default_tile_size.SetSize(default_tile_size, default_tile_size);
 }
 
 }  // namespace client
 }  // namespace blimp