Revert of Introduce components/display_compositor

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
-    '../components/components.gyp:display_compositor',
     '../components/leveldb/leveldb.gyp:leveldb_lib',
     '../components/mime_util/mime_util.gyp:mime_util',
     '../components/scheduler/scheduler.gyp:scheduler_common',
     '../components/url_formatter/url_formatter.gyp:url_formatter',
     '../crypto/crypto.gyp:crypto',
     '../device/battery/battery.gyp:device_battery',
     '../device/battery/battery.gyp:device_battery_mojo_bindings',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
     '../device/usb/usb.gyp:device_usb',
     '../device/vibration/vibration.gyp:device_vibration',
@@ skipping 71 matching lines @@
     '../skia/skia.gyp:skia',
     'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
   ],
   'include_dirs': [
     '..',
     '<(INTERMEDIATE_DIR)',
   ],
   'variables': {
     'public_browser_sources': [
       'public/browser/access_token_store.h',
+      'public/browser/android/service_registry_android.h',
       'public/browser/android/browser_media_player_manager_register.cc',
       'public/browser/android/browser_media_player_manager_register.h',
       'public/browser/android/compositor.h',
       'public/browser/android/compositor_client.h',
       'public/browser/android/content_protocol_handler.h',
       'public/browser/android/content_view_core.h',
       'public/browser/android/content_view_layer_renderer.h',
       'public/browser/android/devtools_auth.h',
       'public/browser/android/download_controller_android.cc',
       'public/browser/android/download_controller_android.h',
       'public/browser/android/external_video_surface_container.h',
-      'public/browser/android/service_registry_android.h',
       'public/browser/android/synchronous_compositor.cc',
       'public/browser/android/synchronous_compositor.h',
       'public/browser/android/synchronous_compositor_client.h',
       'public/browser/appcache_service.h',
       'public/browser/ax_event_notification_details.cc',
       'public/browser/ax_event_notification_details.h',
       'public/browser/background_sync_context.h',
       'public/browser/background_sync_controller.h',
       'public/browser/background_sync_parameters.cc',
       'public/browser/background_sync_parameters.h',
@@ skipping 419 matching lines @@
       'browser/child_process_launcher.h',
       'browser/child_process_security_policy_impl.cc',
       'browser/child_process_security_policy_impl.h',
       'browser/cocoa/system_hotkey_helper_mac.h',
       'browser/cocoa/system_hotkey_helper_mac.mm',
       'browser/cocoa/system_hotkey_map.h',
       'browser/cocoa/system_hotkey_map.mm',
       # NOTE: These files are here instead of in compositor_browser_sources
       # because the latter is not built on Android, whereas these files are
       # needed on all platforms.
+      'browser/compositor/gl_helper.cc',
+      'browser/compositor/gl_helper.h',
+      'browser/compositor/gl_helper_readback_support.cc',
+      'browser/compositor/gl_helper_readback_support.h',
+      'browser/compositor/gl_helper_scaling.cc',
+      'browser/compositor/gl_helper_scaling.h',
       'browser/compositor/surface_utils.cc',
       'browser/compositor/surface_utils.h',
       'browser/device_sensors/ambient_light_mac.cc',
       'browser/device_sensors/ambient_light_mac.h',
       'browser/device_sensors/data_fetcher_shared_memory.h',
       'browser/device_sensors/data_fetcher_shared_memory_android.cc',
       'browser/device_sensors/data_fetcher_shared_memory_base.cc',
       'browser/device_sensors/data_fetcher_shared_memory_base.h',
       'browser/device_sensors/data_fetcher_shared_memory_chromeos.cc',
       'browser/device_sensors/data_fetcher_shared_memory_default.cc',
@@ skipping 490 matching lines @@
       'browser/media/android/url_provision_fetcher.h',
       'browser/media/audible_metrics.cc',
       'browser/media/audible_metrics.h',
       'browser/media/audio_stream_monitor.cc',
       'browser/media/audio_stream_monitor.h',
       'browser/media/capture/audio_mirroring_manager.cc',
       'browser/media/capture/audio_mirroring_manager.h',
       'browser/media/capture/cursor_renderer.h',
       'browser/media/capture/cursor_renderer_aura.cc',
       'browser/media/capture/cursor_renderer_aura.h',
+      'browser/media/capture/cursor_renderer_mac.mm',
       'browser/media/capture/cursor_renderer_mac.h',
-      'browser/media/capture/cursor_renderer_mac.mm',
       'browser/media/capture/desktop_capture_device_uma_types.cc',
       'browser/media/capture/desktop_capture_device_uma_types.h',
       'browser/media/capture/web_contents_audio_input_stream.cc',
       'browser/media/capture/web_contents_audio_input_stream.h',
       'browser/media/capture/web_contents_audio_muter.cc',
       'browser/media/capture/web_contents_audio_muter.h',
       'browser/media/capture/web_contents_tracker.cc',
       'browser/media/capture/web_contents_tracker.h',
       'browser/media/capture/web_contents_video_capture_device.cc',
       'browser/media/capture/web_contents_video_capture_device.h',
@@ skipping 522 matching lines @@
       'browser/web_contents/aura/overscroll_window_animation.h',
       'browser/web_contents/aura/overscroll_window_delegate.cc',
       'browser/web_contents/aura/overscroll_window_delegate.h',
       'browser/web_contents/aura/shadow_layer_delegate.cc',
       'browser/web_contents/aura/shadow_layer_delegate.h',
       'browser/web_contents/web_contents_impl.cc',
       'browser/web_contents/web_contents_impl.h',
       'browser/web_contents/web_contents_view.h',
       'browser/web_contents/web_contents_view_aura.cc',
       'browser/web_contents/web_contents_view_aura.h',
+      'browser/web_contents/web_contents_view_child_frame.h',
       'browser/web_contents/web_contents_view_child_frame.cc',
-      'browser/web_contents/web_contents_view_child_frame.h',
       'browser/web_contents/web_contents_view_guest.cc',
       'browser/web_contents/web_contents_view_guest.h',
       'browser/web_contents/web_contents_view_mac.h',
       'browser/web_contents/web_contents_view_mac.mm',
       'browser/web_contents/web_drag_dest_mac.h',
       'browser/web_contents/web_drag_dest_mac.mm',
       'browser/web_contents/web_drag_source_mac.h',
       'browser/web_contents/web_drag_source_mac.mm',
       'browser/web_contents/web_drag_utils_win.cc',
       'browser/web_contents/web_drag_utils_win.h',
@@ skipping 149 matching lines @@
       'browser/renderer_host/p2p/socket_host_udp.h',
     ],
     'compositor_browser_sources': [
       'browser/compositor/browser_compositor_output_surface.cc',
       'browser/compositor/browser_compositor_output_surface.h',
       'browser/compositor/browser_compositor_overlay_candidate_validator.h',
       'browser/compositor/browser_compositor_overlay_candidate_validator_mac.h',
       'browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h',
+      'browser/compositor/buffer_queue.cc',
+      'browser/compositor/buffer_queue.h',
       'browser/compositor/gpu_browser_compositor_output_surface.cc',
       'browser/compositor/gpu_browser_compositor_output_surface.h',
       'browser/compositor/gpu_process_transport_factory.cc',
       'browser/compositor/gpu_process_transport_factory.h',
       'browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc',
       'browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h',
       'browser/compositor/image_transport_factory.cc',
       'browser/compositor/image_transport_factory.h',
       'browser/compositor/offscreen_browser_compositor_output_surface.cc',
       'browser/compositor/offscreen_browser_compositor_output_surface.h',
@@ skipping 421 matching lines @@
     ['enable_webvr==1 and OS=="android"', {
       'sources': [
         'browser/vr/android/cardboard/cardboard_vr_device.cc',
         'browser/vr/android/cardboard/cardboard_vr_device.h',
         'browser/vr/android/cardboard/cardboard_vr_device_provider.cc',
         'browser/vr/android/cardboard/cardboard_vr_device_provider.h',
       ],
     }],
   ],
 }