blimp: Move compositing, input and render widget feature to client/core.

blimp/client/BUILD.gn

Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 52e0fd97c4fccbec9aed868295876584e1662e94..8f3564c8c0f3dea75c4b5511e3c1eb9b880a5618 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -22,7 +22,6 @@ source_set("session") {
   ]
 
   deps = [
-    ":compositor",
     "//base",
     "//blimp/client/core/compositor",
     "//blimp/client/core/contents",
@@ -55,9 +54,9 @@ source_set("client") {
   ]
 
   deps = [
-    ":compositor",
     "//base",
     "//blimp/client/core",
+    "//blimp/client/core/compositor",
     "//blimp/common",
     "//blimp/common/proto",
     "//blimp/net",
@@ -95,8 +94,6 @@ source_set("feature") {
     "core/contents/tab_control_feature.h",
     "feature/ime_feature.cc",
     "feature/ime_feature.h",
-    "feature/render_widget_feature.cc",
-    "feature/render_widget_feature.h",
     "feature/settings_feature.cc",
     "feature/settings_feature.h",
   ]
@@ -125,8 +122,6 @@ source_set("test_support") {
   sources = [
     "feature/mock_ime_feature_delegate.cc",
     "feature/mock_ime_feature_delegate.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",
   ]
@@ -139,67 +134,14 @@ source_set("test_support") {
   ]
 }
 
-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_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 = [
-    "//blimp/client/core/compositor",
-    "//blimp/common",
-    "//blimp/net",
-    "//cc",
-    "//cc/proto",
-    "//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/base/ime:text_input_types",
-    "//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") {
   testonly = true
 
   sources = [
     "core/contents/tab_control_feature_unittest.cc",
-    "feature/compositor/blimp_compositor_manager_unittest.cc",
-    "feature/render_widget_feature_unittest.cc",
   ]
 
   deps = [
-    ":compositor",
     ":test_support",
     "//base",
     "//base/test:test_support",
@@ -218,11 +160,6 @@ source_set("feature_unit_tests") {
     "//ui/events:gesture_detection",
     "//ui/gfx/geometry",
   ]
-
-  if (is_linux) {
-    #TODO(khushalsagar): Run these tests for android.
-    sources += [ "feature/compositor/blimp_compositor_unittest.cc" ]
-  }
 }
 
 if (is_linux && !is_chromeos && use_x11) {
@@ -238,7 +175,9 @@ if (is_linux && !is_chromeos && use_x11) {
     deps = [
       ":client",
       "//base",
-      "//blimp/client:compositor",
+      "//blimp/client/core/compositor",
+      "//blimp/client/core/compositor:compositor_support",
+      "//blimp/client/core/contents",
       "//blimp/client/core/session",
       "//blimp/net",
       "//net",
@@ -419,8 +358,9 @@ if (is_android) {
       ":client",
       ":jni_headers",
       "//base",
-      "//blimp/client:compositor",
       "//blimp/client/core",
+      "//blimp/client/core/compositor",
+      "//blimp/client/core/compositor:compositor_support",
       "//blimp/client/core/contents",
       "//blimp/client/core/session:session",
       "//blimp/client/public:public_headers",
@@ -442,8 +382,6 @@ if (is_android) {
       "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",