blimp: Move BlimpCompositor to use delegated rendering.

blimp/client/BUILD.gn

 # 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 24 matching lines @@
     "//url:url",
   ]
 }
 
 source_set("client") {
   sources = [
     "app/blimp_discardable_memory_allocator.cc",
     "app/blimp_discardable_memory_allocator.h",
     "app/blimp_startup.cc",
     "app/blimp_startup.h",
+    "app/compositor/browser_compositor.cc",
+    "app/compositor/browser_compositor.h",
   ]
 
   public_deps = [
     ":session",
     "//blimp/client/core:switches",
     "//blimp/client/core/compositor",
+    "//cc",
+    "//cc/surfaces",
     "//components/safe_json",
     "//components/url_formatter",
     "//skia",
     "//ui/events",
+    "//ui/gfx/geometry",
   ]
 
   deps = [
-    ":compositor",
+    ":compositor_support",
     "//base",
     "//blimp/client/core",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//cc",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
@@ skipping 58 matching lines @@
   ]
 
   deps = [
     ":session",
     "//skia",
     "//testing/gmock",
     "//url",
   ]
 }
 
+# TODO(khushalsagar): Move these files to app/compositor.
+source_set("compositor_support") {
+  sources = [
+    "feature/compositor/blimp_context_provider.cc",
+    "feature/compositor/blimp_context_provider.h",
+    "feature/compositor/blimp_gpu_memory_buffer_manager.cc",
+    "feature/compositor/blimp_gpu_memory_buffer_manager.h",
+  ]
+
+  deps = [
+    "//cc",
+    "//gpu/command_buffer/client",
+    "//gpu/command_buffer/client:gl_in_process_context",
+    "//gpu/command_buffer/client:gles2_c_lib",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//gpu/command_buffer/common:gles2_utils",
+    "//gpu/skia_bindings",
+    "//skia",
+    "//ui/gl",
+  ]
+}
+
 source_set("compositor") {
   sources = [
     "feature/compositor/blimp_compositor.cc",
     "feature/compositor/blimp_compositor.h",
     "feature/compositor/blimp_compositor_manager.cc",
     "feature/compositor/blimp_compositor_manager.h",
-    "feature/compositor/blimp_context_provider.cc",
-    "feature/compositor/blimp_context_provider.h",
-    "feature/compositor/blimp_delegating_output_surface.cc",
-    "feature/compositor/blimp_delegating_output_surface.h",
-    "feature/compositor/blimp_gpu_memory_buffer_manager.cc",
-    "feature/compositor/blimp_gpu_memory_buffer_manager.h",
     "feature/compositor/blimp_input_handler_wrapper.cc",
     "feature/compositor/blimp_input_handler_wrapper.h",
     "feature/compositor/blimp_input_manager.cc",
     "feature/compositor/blimp_input_manager.h",
     "feature/compositor/blimp_layer_tree_settings.cc",
     "feature/compositor/blimp_layer_tree_settings.h",
-    "feature/compositor/blimp_output_surface.cc",
-    "feature/compositor/blimp_output_surface.h",
   ]
 
   deps = [
+    ":compositor_support",
     "//blimp/client/core/compositor",
+    "//blimp/client/core/compositor:compositor_support",
     "//blimp/common",
     "//blimp/net",
     "//cc",
     "//cc/proto",
     "//cc/surfaces",
-    "//gpu/command_buffer/client",
-    "//gpu/command_buffer/client:gl_in_process_context",
-    "//gpu/command_buffer/client:gles2_c_lib",
-    "//gpu/command_buffer/client:gles2_implementation",
-    "//gpu/command_buffer/common:gles2_utils",
-    "//gpu/skia_bindings",
     "//net",
-    "//skia",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/libwebp",
     "//ui/events:gesture_detection",
     "//ui/events/blink",
     "//ui/events/gestures/blink",
-    "//ui/gl",
   ]
 
   public_deps = [
     ":feature",
     "//blimp/common/proto",
     "//skia",
   ]
 }
 
 source_set("feature_unit_tests") {
@@ skipping 284 matching lines @@
   instrumentation_test_apk("blimp_test_apk") {
     apk_name = "BlimpTest"
     apk_under_test = ":blimp_apk"
     android_manifest = blimp_test_apk_manifest
     android_manifest_dep = ":blimp_test_apk_manifest"
     deps = [
       ":blimp_test_java",
     ]
   }
 }