Move content/common/gpu/client to gpu/ipc/client

gpu/gpu.gyp

 # 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.
 
 {
   'variables': {
     'nacl_win64_target': 0,
     'build_angle_deqp_tests%': 0,
   },
   'includes': [
@@ skipping 155 matching lines @@
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/gl/gl.gyp:gl',
         '../ui/gl/gl.gyp:gl_test_support',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'command_buffer_client',
         'command_buffer_common',
         'command_buffer_service',
         'gpu',
         'gpu_unittest_utils',
+        'gl_in_process_context',
         'gles2_implementation',
         'gles2_cmd_helper',
         'gles2_c_lib',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'command_buffer/client/buffer_tracker_unittest.cc',
         'command_buffer/client/client_test_helper.cc',
         'command_buffer/client/client_test_helper.h',
         'command_buffer/client/cmd_buffer_helper_test.cc',
@@ skipping 52 matching lines @@
         'command_buffer/service/gles2_cmd_decoder_unittest_textures.cc',
         'command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc',
         'command_buffer/service/gpu_service_test.cc',
         'command_buffer/service/gpu_service_test.h',
         'command_buffer/service/gpu_tracer_unittest.cc',
         'command_buffer/service/id_manager_unittest.cc',
         'command_buffer/service/mailbox_manager_unittest.cc',
         'command_buffer/service/memory_program_cache_unittest.cc',
         'command_buffer/service/mocks.cc',
         'command_buffer/service/mocks.h',
+        'command_buffer/service/path_manager_unittest.cc',
         'command_buffer/service/program_cache_unittest.cc',
         'command_buffer/service/program_manager_unittest.cc',
         'command_buffer/service/query_manager_unittest.cc',
         'command_buffer/service/renderbuffer_manager_unittest.cc',
         'command_buffer/service/shader_manager_unittest.cc',
         'command_buffer/service/shader_translator_cache_unittest.cc',
         'command_buffer/service/shader_translator_unittest.cc',
         'command_buffer/service/sync_point_manager_unittest.cc',
         'command_buffer/service/test_helper.cc',
         'command_buffer/service/test_helper.h',
-        'command_buffer/service/path_manager_unittest.cc',
         'command_buffer/service/texture_manager_unittest.cc',
         'command_buffer/service/transfer_buffer_manager_unittest.cc',
         'command_buffer/service/valuebuffer_manager_unittest.cc',
         'command_buffer/service/vertex_array_manager_unittest.cc',
         'command_buffer/service/vertex_attrib_manager_unittest.cc',
         'config/gpu_blacklist_unittest.cc',
         'config/gpu_control_list_entry_unittest.cc',
         'config/gpu_control_list_number_info_unittest.cc',
         'config/gpu_control_list_os_info_unittest.cc',
         'config/gpu_control_list_unittest.cc',
         'config/gpu_control_list_version_info_unittest.cc',
         'config/gpu_driver_bug_list_unittest.cc',
         'config/gpu_info_collector_unittest.cc',
         'config/gpu_info_unittest.cc',
         'config/gpu_test_config_unittest.cc',
         'config/gpu_test_expectations_parser_unittest.cc',
         'config/gpu_util_unittest.cc',
+        'ipc/client/gpu_memory_buffer_impl_shared_memory_unittest.cc',
+        'ipc/client/gpu_memory_buffer_impl_test_template.h',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
+        ['OS == "mac"', {
+          'sources+': [
+           'ipc/client/gpu_memory_buffer_impl_io_surface_unittest.cc',
+          ]
+        }],
+        ['use_ozone == 1', {
+          'sources+': [
+           'ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap_unittest.cc',
+          ]
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
       # GN version: //gpu/gpu_perftests
       'target_name': 'gpu_perftests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 52 matching lines @@
       'sources': [
         # Note: sources list duplicated in GN build.
         'command_buffer/tests/compressed_texture_test.cc',
         'command_buffer/tests/es3_misc_functions_unittest.cc',
         'command_buffer/tests/gl_bind_uniform_location_unittest.cc',
         'command_buffer/tests/gl_chromium_framebuffer_mixed_samples_unittest.cc',
         'command_buffer/tests/gl_chromium_framebuffer_multisample_unittest.cc',
         'command_buffer/tests/gl_chromium_path_rendering_unittest.cc',
         'command_buffer/tests/gl_clear_framebuffer_unittest.cc',
         'command_buffer/tests/gl_compressed_copy_texture_CHROMIUM_unittest.cc',
+        'command_buffer/tests/gl_copy_tex_image_2d_workaround_unittest.cc',
         'command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc',
-        'command_buffer/tests/gl_copy_tex_image_2d_workaround_unittest.cc',
         'command_buffer/tests/gl_cube_map_texture_unittest.cc',
         'command_buffer/tests/gl_depth_texture_unittest.cc',
         'command_buffer/tests/gl_dynamic_config_unittest.cc',
         'command_buffer/tests/gl_ext_blend_func_extended_unittest.cc',
         'command_buffer/tests/gl_ext_multisample_compatibility_unittest.cc',
         'command_buffer/tests/gl_ext_srgb_unittest.cc',
         'command_buffer/tests/gl_fence_sync_unittest.cc',
         'command_buffer/tests/gl_gpu_memory_buffer_unittest.cc',
         'command_buffer/tests/gl_iosurface_readback_workaround_unittest.cc',
         'command_buffer/tests/gl_lose_context_chromium_unittest.cc',
@@ skipping 151 matching lines @@
         {
           # GN version: //gpu
           'target_name': 'gpu',
           'type': 'none',
           'dependencies': [
             'command_buffer_client',
             'command_buffer_common',
             'command_buffer_service',
             'gles2_cmd_helper',
             'gpu_config',
+            'gpu_ipc_client',
             'gpu_ipc_common',
           ],
           'sources': [
             'gpu_export.h',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
           # GN version: //gpu/command_buffer/common
@@ skipping 58 matching lines @@
         },
         {
           # GN version: //gpu/ipc/common:command_buffer_traits
           'target_name': 'command_buffer_traits',
           'type': 'static_library',
           'includes': [
             'command_buffer_traits.gypi',
           ],
         },
         {
+          # GN version: //gpu/ipc/client
+          'target_name': 'gpu_ipc_client',
+          'type': 'static_library',
+          'includes': [
+            'gpu_ipc_client.gypi',
+          ],
+          'dependencies': [
+            'command_buffer_traits',
+          ],
+        },
+        {
           # GN version: //gpu/ipc/common
           'target_name': 'gpu_ipc_common',
           'type': 'static_library',
           'includes': [
             'gpu_ipc_common.gypi',
           ],
           'dependencies': [
             'command_buffer_traits',
           ],
         },
@@ skipping 23 matching lines @@
           # GN version: //gpu
           'target_name': 'gpu',
           'type': 'shared_library',
           'includes': [
             'command_buffer_client.gypi',
             'command_buffer_common.gypi',
             'command_buffer_service.gypi',
             'command_buffer_traits.gypi',
             'gles2_cmd_helper.gypi',
             'gpu_config.gypi',
+            'gpu_ipc_client.gypi',
             'gpu_ipc_common.gypi',
             '../build/android/increase_size_for_speed.gypi',
           ],
           'defines': [
             'GPU_IMPLEMENTATION',
           ],
           'sources': [
             'gpu_export.h',
           ],
           'dependencies': [
@@ skipping 41 matching lines @@
         },
         {
           # GN version: //gpu/ipc/common:command_buffer_traits
           'target_name': 'command_buffer_traits',
           'type': 'none',
           'dependencies': [
             'gpu',
           ],
         },
         {
+          # GN version: //gpu/ipc/client
+          'target_name': 'gpu_ipc_client',
+          'type': 'none',
+          'dependencies': [
+            'gpu',
+          ],
+        },
+        {
           # GN version: //gpu/ipc/common
           'target_name': 'gpu_ipc_common',
           'type': 'none',
           'dependencies': [
             'gpu',
           ],
         },
       ],
     }],
     ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
@@ skipping 297 matching lines @@
             ],
             'sources': [
               'gpu_unittests_apk.isolate',
             ],
           },
         ],
       },
     ],
   ],
 }