Expose Blimp dependencies to the embedder

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 32 matching lines @@
     "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",
+    "//blimp/client/support",
     "//cc",
     "//cc/surfaces",
     "//components/safe_json",
     "//components/url_formatter",
     "//skia",
     "//ui/events",
     "//ui/gfx/geometry",
   ]
 
   deps = [
-    ":compositor_support",
     "//base",
     "//blimp/client/core",
+    "//blimp/client/support",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//cc",
     "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/skia_bindings",
     "//net",
     "//third_party/libwebp",
     "//ui/gfx/geometry",
     "//ui/gl",
@@ skipping 42 matching lines @@
 
   public_deps = [
     "//blimp/common/proto",
   ]
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
+    "feature/compositor/mock_compositor_dependencies.cc",
+    "feature/compositor/mock_compositor_dependencies.h",
     "feature/mock_render_widget_feature_delegate.cc",
     "feature/mock_render_widget_feature_delegate.h",
     "session/test_client_session.cc",
     "session/test_client_session.h",
   ]
 
   deps = [
     ":session",
+    "//blimp/client/support",
+    "//cc:test_support",
     "//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_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",
   ]
 
   deps = [
-    ":compositor_support",
     "//blimp/client/core/compositor",
     "//blimp/client/core/compositor",

[Khushal, 2016/08/26 19:34:25]

moar compositor!!
I think I ended up doing this in my change though. Sorry.

[David Trainor- moved to gerrit, 2016/08/29 15:55:24]

My fault too for not catching it :(.

     "//blimp/common",
     "//blimp/net",
     "//cc",
     "//cc/proto",
     "//cc/surfaces",
     "//net",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/libwebp",
     "//ui/events:gesture_detection",
     "//ui/events/blink",
@@ skipping 14 matching lines @@
 
   sources = [
     "core/contents/tab_control_feature_unittest.cc",
     "feature/compositor/blimp_compositor_manager_unittest.cc",
     "feature/compositor/blimp_compositor_unittest.cc",
     "feature/render_widget_feature_unittest.cc",
   ]
 
   deps = [
     ":compositor",
-    ":compositor_support",
     ":test_support",
     "//base",
     "//base/test:test_support",
     "//blimp/client/core/compositor",
+    "//blimp/client/support",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
     "//blimp/net:test_support",
     "//blimp/test:support",
     "//cc/proto",
     "//cc/surfaces:surfaces",
     "//net",
     "//net:test_support",
     "//skia",
@@ skipping 214 matching lines @@
       "//ui/gfx/geometry",
       "//ui/gl",
       "//url:url",
     ]
 
     sources = [
       "app/android/blimp_app_jni_registrar.cc",
       "app/android/blimp_app_jni_registrar.h",
       "app/android/blimp_client_session_android.cc",
       "app/android/blimp_client_session_android.h",
-      "app/android/blimp_compositor_manager_android.cc",
-      "app/android/blimp_compositor_manager_android.h",
       "app/android/blimp_library_loader.cc",
       "app/android/blimp_library_loader.h",
       "app/android/blimp_view.cc",
       "app/android/blimp_view.h",
       "app/android/tab_control_feature_android.cc",
       "app/android/tab_control_feature_android.h",
       "app/android/toolbar.cc",
       "app/android/toolbar.h",
       "app/android/web_input_box.cc",
       "app/android/web_input_box.h",
@@ skipping 21 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",
     ]
   }
 }