Expose Blimp dependencies to the embedder

blimp/client/support/compositor/android/compositor_dependencies_impl_android.cc

Index: blimp/client/support/compositor/android/compositor_dependencies_impl_android.cc
diff --git a/blimp/client/app/android/blimp_compositor_manager_android.cc b/blimp/client/support/compositor/android/compositor_dependencies_impl_android.cc
similarity index 58%
rename from blimp/client/app/android/blimp_compositor_manager_android.cc
rename to blimp/client/support/compositor/android/compositor_dependencies_impl_android.cc
index 076bc70483d763c2da8f04d9cc7f22e7b1fe9d74..5c09854c81c884bf98bce51358a3a48c13c849cb 100644
--- a/blimp/client/app/android/blimp_compositor_manager_android.cc
+++ b/blimp/client/support/compositor/android/compositor_dependencies_impl_android.cc
@@ -1,14 +1,10 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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 "blimp/client/support/compositor/android/compositor_dependencies_impl_android.h"
 
-#include <algorithm>
-#include <memory>
-
-#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
+#include "cc/trees/layer_tree_settings.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace {
@@ -20,46 +16,26 @@ const int kMinimumTileContentWidthPixels = 64;
 namespace blimp {
 namespace client {
 
-// static
-std::unique_ptr<BlimpCompositorManagerAndroid>
-BlimpCompositorManagerAndroid::Create(
+CompositorDependenciesImplAndroid::CompositorDependenciesImplAndroid(
     const gfx::Size& real_size,
-    const gfx::Size& size,
-    RenderWidgetFeature* render_widget_feature,
-    cc::SurfaceManager* surface_manager,
-    BlimpGpuMemoryBufferManager* gpu_memory_buffer_manager,
-    SurfaceIdAllocationCallback callback) {
+    const gfx::Size& size) {
   gfx::Size device_size(real_size);
-  bool real_size_supported = true;
+  real_size_supported_ = true;
   if (device_size.IsEmpty()) {
-    real_size_supported = false;
+    real_size_supported_ = false;
     device_size = size;
   }
-  return base::WrapUnique(new BlimpCompositorManagerAndroid(
-      device_size, real_size_supported, 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());
 }
 
-BlimpCompositorManagerAndroid::BlimpCompositorManagerAndroid(
-    const gfx::Size& size,
-    bool real_size_supported,
-    RenderWidgetFeature* render_widget_feature,
-    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() {}
+CompositorDependenciesImplAndroid::~CompositorDependenciesImplAndroid() =
+    default;
 
-void BlimpCompositorManagerAndroid::GenerateLayerTreeSettings(
-    cc::LayerTreeSettings* settings) {
-  BlimpCompositorManager::GenerateLayerTreeSettings(settings);
+std::unique_ptr<cc::LayerTreeSettings>
+CompositorDependenciesImplAndroid::GetLayerTreeSettings() {
+  std::unique_ptr<cc::LayerTreeSettings> settings =
+      CompositorDependenciesImpl::GetLayerTreeSettings();
 
   // Calculate the correct raster tile size to use.  Assuming a square tile.
   DCHECK_EQ(settings->default_tile_size.width(),
@@ -101,6 +77,8 @@ void BlimpCompositorManagerAndroid::GenerateLayerTreeSettings(
       default_tile_size = 512;
   }
   settings->default_tile_size.SetSize(default_tile_size, default_tile_size);
+
+  return settings;
 }
 
 }  // namespace client