Revert of Refactor content/common/gpu into gpu/ipc/service

content/content_common.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',
     '../cc/cc.gyp:cc',
     '../components/tracing.gyp:tracing',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
     '../gpu/blink/gpu_blink.gyp:gpu_blink',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../gpu/gpu.gyp:command_buffer_service',
     '../gpu/gpu.gyp:gles2_c_lib',
     '../gpu/gpu.gyp:gles2_implementation',
-
-    # TODO(markdittmer): This should be removed once content/common/gpu/media
-    # is refactored into media/ipc.
-    '../gpu/gpu.gyp:gpu_ipc_service',
-
     # TODO: the dependency on gl_in_process_context should be decoupled from
     # content and moved to android_webview. See crbug.com/365797.
     '../gpu/gpu.gyp:gl_in_process_context',
     '../gpu/gpu.gyp:gpu',
     '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
     '../ipc/ipc.gyp:ipc',
     '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
     '../media/media.gyp:media',
     '../media/media.gyp:shared_memory_support',
     '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_common',
@@ skipping 311 matching lines @@
       'common/gamepad_param_traits.cc',
       'common/gamepad_param_traits.h',
       'common/gamepad_user_gesture.cc',
       'common/gamepad_user_gesture.h',
       'common/generic_shared_memory_id_generator.cc',
       'common/generic_shared_memory_id_generator.h',
       'common/geofencing_messages.h',
       'common/geofencing_types.cc',
       'common/geofencing_types.h',
       'common/gin_java_bridge_messages.h',
+      'common/gpu/ca_layer_partial_damage_tree_mac.h',
+      'common/gpu/ca_layer_partial_damage_tree_mac.mm',
+      'common/gpu/ca_layer_tree_mac.h',
+      'common/gpu/ca_layer_tree_mac.mm',
+      'common/gpu/child_window_surface_win.cc',
+      'common/gpu/child_window_surface_win.h',
       'common/gpu/client/command_buffer_metrics.cc',
       'common/gpu/client/command_buffer_metrics.h',
       'common/gpu/client/context_provider_command_buffer.cc',
       'common/gpu/client/context_provider_command_buffer.h',
       'common/gpu/client/gpu_jpeg_decode_accelerator_host.cc',
       'common/gpu/client/gpu_jpeg_decode_accelerator_host.h',
       'common/gpu/client/gpu_video_decode_accelerator_host.cc',
       'common/gpu/client/gpu_video_decode_accelerator_host.h',
       'common/gpu/client/gpu_video_encode_accelerator_host.cc',
       'common/gpu/client/gpu_video_encode_accelerator_host.h',
       'common/gpu/client/grcontext_for_webgraphicscontext3d.cc',
       'common/gpu/client/grcontext_for_webgraphicscontext3d.h',
       'common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc',
       'common/gpu/client/webgraphicscontext3d_command_buffer_impl.h',
+      'common/gpu/gpu_channel.cc',
+      'common/gpu/gpu_channel.h',
+      'common/gpu/gpu_channel_manager.cc',
+      'common/gpu/gpu_channel_manager.h',
+      'common/gpu/gpu_channel_manager_delegate.h',
+      'common/gpu/gpu_command_buffer_stub.cc',
+      'common/gpu/gpu_command_buffer_stub.h',
+      'common/gpu/gpu_config.h',
+      'common/gpu/gpu_memory_buffer_factory.cc',
+      'common/gpu/gpu_memory_buffer_factory.h',
+      'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
+      'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
+      'common/gpu/gpu_memory_manager.cc',
+      'common/gpu/gpu_memory_manager.h',
+      'common/gpu/gpu_memory_tracking.cc',
+      'common/gpu/gpu_memory_tracking.h',
+      'common/gpu/gpu_watchdog.h',
+      'common/gpu/image_transport_surface.h',
+      'common/gpu/image_transport_surface_android.cc',
+      'common/gpu/image_transport_surface_linux.cc',
+      'common/gpu/image_transport_surface_mac.mm',
+      'common/gpu/image_transport_surface_overlay_mac.h',
+      'common/gpu/image_transport_surface_overlay_mac.mm',
+      'common/gpu/image_transport_surface_win.cc',
       'common/gpu/media/fake_video_decode_accelerator.cc',
       'common/gpu/media/fake_video_decode_accelerator.h',
       'common/gpu/media/gpu_jpeg_decode_accelerator.cc',
       'common/gpu/media/gpu_jpeg_decode_accelerator.h',
       'common/gpu/media/gpu_video_accelerator_util.cc',
       'common/gpu/media/gpu_video_accelerator_util.h',
       'common/gpu/media/gpu_video_decode_accelerator.cc',
       'common/gpu/media/gpu_video_decode_accelerator.h',
       'common/gpu/media/gpu_video_encode_accelerator.cc',
       'common/gpu/media/gpu_video_encode_accelerator.h',
       'common/gpu/media/media_channel.cc',
       'common/gpu/media/media_channel.h',
       'common/gpu/media/media_service.cc',
       'common/gpu/media/media_service.h',
       'common/gpu/media/shared_memory_region.cc',
       'common/gpu/media/shared_memory_region.h',
+      'common/gpu/pass_through_image_transport_surface.cc',
+      'common/gpu/pass_through_image_transport_surface.h',
+      'common/gpu/stream_texture_android.cc',
+      'common/gpu/stream_texture_android.h',
       'common/gpu_host_messages.h',
       'common/gpu_process_launch_causes.h',
       'common/host_discardable_shared_memory_manager.cc',
       'common/host_discardable_shared_memory_manager.h',
       'common/host_shared_bitmap_manager.cc',
       'common/host_shared_bitmap_manager.h',
       'common/in_process_child_thread_params.cc',
       'common/in_process_child_thread_params.h',
       'common/indexed_db/indexed_db_constants.h',
       'common/indexed_db/indexed_db_key.cc',
@@ skipping 223 matching lines @@
     }],
   ],
   'conditions': [
     ['OS=="mac"', {
       'dependencies': [
         '../media/media.gyp:media',
         'app/resources/content_resources.gyp:content_resources',
         '../ui/accelerated_widget_mac/accelerated_widget_mac.gyp:accelerated_widget_mac'
       ],
       'sources': [
+        'common/gpu/gpu_memory_buffer_factory_io_surface.cc',
+        'common/gpu/gpu_memory_buffer_factory_io_surface.h',
         'common/gpu/media/vt_mac.h',
         'common/gpu/media/vt_video_decode_accelerator_mac.cc',
         'common/gpu/media/vt_video_decode_accelerator_mac.h',
         'common/gpu/media/vt_video_encode_accelerator_mac.cc',
         'common/gpu/media/vt_video_encode_accelerator_mac.h',
       ],
       'sources!': [
         'common/plugin_list_posix.cc',
       ],
       'link_settings': {
@@ skipping 40 matching lines @@
                      '-s', '<(stubs_filename_root)',
                      '-p', '<(project_path)',
                      '<@(_inputs)',
           ],
           'process_outputs_as_sources': 1,
           'message': 'Generating VideoToolbox stubs for dynamic loading',
         },
       ],
     }],
     ['OS=="android"',{
+      'sources': [
+        'common/gpu/gpu_memory_buffer_factory_surface_texture.cc',
+        'common/gpu/gpu_memory_buffer_factory_surface_texture.h',
+      ],
       'link_settings': {
         'libraries': [
           '-landroid',  # ANativeWindow
         ],
       },
      'dependencies': [
         'content.gyp:content_jni_headers',
         'content.gyp:common_aidl',
       ],
     }],
     ['use_pango == 1', {
       'dependencies': [
         '../build/linux/system.gyp:pangocairo',
       ],
       'sources!': [
         'common/font_list_ozone.cc',
       ],
     }],
     ['use_x11 == 1', {
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
       ],
       'dependencies': [
          '<(DEPTH)/build/linux/system.gyp:xcomposite',
       ],
     }],
+    ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
+      'sources': [
+        'common/gpu/x_util.h',
+      ],
+    }],
     ['enable_plugins==1', {
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
       ],
     }, {  # enable_plugins == 0
       'sources!': [
         'common/pepper_file_util.cc',
         'common/pepper_file_util.h',
         'common/pepper_messages.h',
         'common/pepper_plugin_list.cc',
@@ skipping 322 matching lines @@
       'sources!': [
         'common/cursors/webcursor_ozone.cc',
         'common/font_list_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
       ],
     }],
   ],
 }