From ef5a0b65bc5d6b5e7b293db91d90ddfcdeed4995 Mon Sep 17 00:00:00 2001 From: fsamuel Date: Fri, 4 Mar 2016 16:35:47 -0800 Subject: [PATCH] mustash: Move gpu/ipc to gpu/ipc/common Mus will use the gpu service and client code currently in content/common/gpu. BUG=586389 CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel Review URL: https://codereview.chromium.org/1714903003 Cr-Commit-Position: refs/heads/master@{#379416} --- components/mus/public/interfaces/BUILD.gn | 2 +- content/common/BUILD.gn | 2 +- content/common/cc_messages.h | 2 +- content/common/gpu/gpu_messages.h | 2 +- gpu/BUILD.gn | 1 - gpu/command_buffer/common/BUILD.gn | 2 +- gpu/command_buffer/common/mojo.typemap | 12 ++--- gpu/gpu.gyp | 45 ------------------- gpu/gpu_ipc.gypi | 28 ------------ gpu/gpu_ipc_common.gypi | 5 +++ gpu/gpu_nacl.gyp | 2 +- gpu/ipc/BUILD.gn | 35 --------------- gpu/ipc/common/BUILD.gn | 11 ++++- gpu/ipc/{ => common}/DEPS | 0 gpu/ipc/{ => common}/OWNERS | 0 .../{ => common}/gpu_command_buffer_traits.cc | 10 ++--- .../{ => common}/gpu_command_buffer_traits.h | 4 +- .../gpu_command_buffer_traits_multi.h | 0 gpu/ipc/{ => common}/id_type_traits.h | 0 ppapi/BUILD.gn | 2 +- ppapi/native_client/BUILD.gn | 2 +- ppapi/ppapi_internal.gyp | 10 ++--- ppapi/ppapi_tests.gypi | 2 +- ppapi/proxy/BUILD.gn | 4 +- ppapi/proxy/ppapi_messages.h | 2 +- 25 files changed, 44 insertions(+), 141 deletions(-) delete mode 100644 gpu/gpu_ipc.gypi delete mode 100644 gpu/ipc/BUILD.gn rename gpu/ipc/{ => common}/DEPS (100%) rename gpu/ipc/{ => common}/OWNERS (100%) rename gpu/ipc/{ => common}/gpu_command_buffer_traits.cc (95%) rename gpu/ipc/{ => common}/gpu_command_buffer_traits.h (96%) rename gpu/ipc/{ => common}/gpu_command_buffer_traits_multi.h (100%) rename gpu/ipc/{ => common}/id_type_traits.h (100%) diff --git a/components/mus/public/interfaces/BUILD.gn b/components/mus/public/interfaces/BUILD.gn index 40ebaf8a47377b..7cba5ceca9c22b 100644 --- a/components/mus/public/interfaces/BUILD.gn +++ b/components/mus/public/interfaces/BUILD.gn @@ -38,5 +38,5 @@ mojom("interfaces") { ] typemaps = [ "//gpu/command_buffer/common/mojo.typemap" ] - typemap_deps = [ "//gpu/ipc" ] + typemap_deps = [ "//gpu/ipc/common" ] } diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 63d416ae81975f..3dbb130674cf8e 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -188,7 +188,7 @@ source_set("common") { "//gpu/command_buffer/client:gles2_cmd_helper", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/service", - "//gpu/ipc", + "//gpu/ipc/common", "//gpu/skia_bindings", "//media", "//media:shared_memory_support", diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h index 8870a1b8a4877c..1dacc95933d982 100644 --- a/content/common/cc_messages.h +++ b/content/common/cc_messages.h @@ -28,7 +28,7 @@ #include "cc/surfaces/surface_id.h" #include "cc/surfaces/surface_sequence.h" #include "content/common/content_export.h" -#include "gpu/ipc/gpu_command_buffer_traits.h" +#include "gpu/ipc/common/gpu_command_buffer_traits.h" #include "ipc/ipc_message_macros.h" #include "ui/gfx/ipc/gfx_param_traits.h" diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 0248caa1328bda..7fe5c471821441 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -26,7 +26,7 @@ #include "gpu/command_buffer/common/sync_token.h" #include "gpu/command_buffer/common/value_state.h" #include "gpu/config/gpu_info.h" -#include "gpu/ipc/gpu_command_buffer_traits.h" +#include "gpu/ipc/common/gpu_command_buffer_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "ui/events/latency_info.h" diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn index bf1d6b0aee490e..d426e15ea9b005 100644 --- a/gpu/BUILD.gn +++ b/gpu/BUILD.gn @@ -45,7 +45,6 @@ component("gpu") { "//gpu/command_buffer/common:common_sources", "//gpu/command_buffer/service:service_sources", "//gpu/config:config_sources", - "//gpu/ipc:ipc_sources", "//gpu/ipc/common:ipc_common_sources", ] } diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn index af72abaee702c0..ea6d6068a54d6b 100644 --- a/gpu/command_buffer/common/BUILD.gn +++ b/gpu/command_buffer/common/BUILD.gn @@ -91,5 +91,5 @@ mojom("interfaces") { ] typemaps = [ "mojo.typemap" ] - typemap_deps = [ "//gpu/ipc" ] + typemap_deps = [ "//gpu/ipc/common" ] } diff --git a/gpu/command_buffer/common/mojo.typemap b/gpu/command_buffer/common/mojo.typemap index 4e278565efff2a..cbc36c56adafc8 100644 --- a/gpu/command_buffer/common/mojo.typemap +++ b/gpu/command_buffer/common/mojo.typemap @@ -8,42 +8,42 @@ "typename": "gpu::Capabilities", "headers": [ "gpu/command_buffer/common/capabilities.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] }, "gpu.mojom.CommandBufferState": { "typename": "gpu::CommandBuffer::State", "headers": [ "gpu/command_buffer/common/command_buffer.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] }, "gpu.mojom.Mailbox": { "typename": "gpu::Mailbox", "headers": [ "gpu/command_buffer/common/mailbox.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] }, "gpu.mojom.MailboxHolder": { "typename": "gpu::MailboxHolder", "headers": [ "gpu/command_buffer/common/mailbox_holder.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] }, "gpu.mojom.SyncToken": { "typename": "gpu::SyncToken", "headers": [ "gpu/command_buffer/common/sync_token.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] }, "gpu.mojom.ValueState": { "typename": "gpu::ValueState", "headers": [ "gpu/command_buffer/common/value_state.h", - "gpu/ipc/gpu_command_buffer_traits.h" + "gpu/ipc/common/gpu_command_buffer_traits.h" ] } } diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 07b7cab2e62f09..b8dec1b097d82a 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -523,7 +523,6 @@ 'command_buffer_service', 'gles2_cmd_helper', 'gpu_config', - 'gpu_ipc', 'gpu_ipc_common', ], 'sources': [ @@ -593,17 +592,6 @@ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, - { - # GN version: //gpu/ipc - 'target_name': 'gpu_ipc', - 'type': 'static_library', - 'includes': [ - 'gpu_ipc.gypi', - ], - 'dependencies': [ - 'command_buffer_common', - ], - }, { # GN version: //gpu/ipc/common 'target_name': 'gpu_ipc_common', @@ -644,7 +632,6 @@ 'command_buffer_service.gypi', 'gles2_cmd_helper.gypi', 'gpu_config.gypi', - 'gpu_ipc.gypi', 'gpu_ipc_common.gypi', '../build/android/increase_size_for_speed.gypi', ], @@ -697,14 +684,6 @@ 'gpu', ], }, - { - # GN version: //gpu/ipc - 'target_name': 'gpu_ipc', - 'type': 'none', - 'dependencies': [ - 'gpu', - ], - }, { # GN version: //gpu/ipc/common 'target_name': 'gpu_ipc_common', @@ -739,30 +718,6 @@ }, }, }, - { - 'target_name': 'gpu_ipc_win64', - 'type': 'static_library', - 'variables': { - 'nacl_win64_target': 1, - }, - 'includes': [ - 'gpu_ipc.gypi', - ], - 'dependencies': [ - '../base/base.gyp:base_win64', - '../ipc/ipc.gyp:ipc_win64', - 'command_buffer_common_win64', - ], - 'defines': [ - '<@(nacl_win64_defines)', - 'GPU_IMPLEMENTATION', - ], - 'configurations': { - 'Common_Base': { - 'msvs_target_platform': 'x64', - }, - }, - }, { 'target_name': 'gpu_ipc_common_win64', 'type': 'static_library', diff --git a/gpu/gpu_ipc.gypi b/gpu/gpu_ipc.gypi deleted file mode 100644 index 1d6e1c9d2926fa..00000000000000 --- a/gpu/gpu_ipc.gypi +++ /dev/null @@ -1,28 +0,0 @@ -# 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': [ - '../ipc/ipc.gyp:ipc', - '../third_party/khronos/khronos.gyp:khronos_headers', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'ipc/gpu_command_buffer_traits.cc', - 'ipc/gpu_command_buffer_traits.h', - 'ipc/id_type_traits.h', - ], - 'conditions': [ - # This section applies to gpu_ipc_win64, used by the NaCl Win64 helper - # (nacl64.exe). - ['nacl_win64_target==1', { - # gpu_ipc_win64 must only link against the 64-bit ipc target. - 'dependencies!': [ - '../ipc/ipc.gyp:ipc', - ], - }], - ], -} diff --git a/gpu/gpu_ipc_common.gypi b/gpu/gpu_ipc_common.gypi index 48f404acf2d1ab..9cbe65a80a2099 100644 --- a/gpu/gpu_ipc_common.gypi +++ b/gpu/gpu_ipc_common.gypi @@ -6,11 +6,15 @@ 'dependencies': [ '../base/base.gyp:base', '../ipc/ipc.gyp:ipc', + '../third_party/khronos/khronos.gyp:khronos_headers', ], 'include_dirs': [ '..', ], 'sources': [ + 'ipc/common/gpu_command_buffer_traits.cc', + 'ipc/common/gpu_command_buffer_traits.h', + 'ipc/common/id_type_traits.h', 'ipc/common/memory_stats.cc', 'ipc/common/memory_stats.h', ], @@ -20,6 +24,7 @@ ['nacl_win64_target==1', { # gpu_ipc_win64 must only link against the 64-bit ipc target. 'dependencies!': [ + '../base/base.gyp:base', '../ipc/ipc.gyp:ipc', ], }], diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp index 1f386195cc5ee6..7c8cfc0fa30a43 100644 --- a/gpu/gpu_nacl.gyp +++ b/gpu/gpu_nacl.gyp @@ -117,7 +117,7 @@ 'build_nonsfi_helper': 1, }, 'includes': [ - 'gpu_ipc.gypi', + 'gpu_ipc_common.gypi', ], 'dependencies': [ '../base/base_nacl.gyp:base_nacl', diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn deleted file mode 100644 index bcf999d2ac6a72..00000000000000 --- a/gpu/ipc/BUILD.gn +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2014 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. - -group("ipc") { - if (is_component_build) { - public_deps = [ - "//gpu", - ] - } else { - public_deps = [ - ":ipc_sources", - ] - } -} - -source_set("ipc_sources") { - visibility = [ "//gpu/*" ] - - sources = [ - "gpu_command_buffer_traits.cc", - "gpu_command_buffer_traits.h", - "id_type_traits.h", - ] - - configs += [ - "//gpu:gpu_implementation", - "//third_party/khronos:khronos_headers", - ] - - deps = [ - "//gpu/command_buffer/common:common_sources", - "//ipc", - ] -} diff --git a/gpu/ipc/common/BUILD.gn b/gpu/ipc/common/BUILD.gn index d99f57779615ea..5d4cb18d692da3 100644 --- a/gpu/ipc/common/BUILD.gn +++ b/gpu/ipc/common/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -group("ipc") { +group("common") { if (is_component_build) { public_deps = [ "//gpu", @@ -18,14 +18,21 @@ source_set("ipc_common_sources") { visibility = [ "//gpu/*" ] sources = [ + "gpu_command_buffer_traits.cc", + "gpu_command_buffer_traits.h", + "id_type_traits.h", "memory_stats.cc", "memory_stats.h", ] - configs += [ "//gpu:gpu_implementation" ] + configs += [ + "//gpu:gpu_implementation", + "//third_party/khronos:khronos_headers", + ] deps = [ "//base", + "//gpu/command_buffer/common:common_sources", "//ipc", ] } diff --git a/gpu/ipc/DEPS b/gpu/ipc/common/DEPS similarity index 100% rename from gpu/ipc/DEPS rename to gpu/ipc/common/DEPS diff --git a/gpu/ipc/OWNERS b/gpu/ipc/common/OWNERS similarity index 100% rename from gpu/ipc/OWNERS rename to gpu/ipc/common/OWNERS diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/common/gpu_command_buffer_traits.cc similarity index 95% rename from gpu/ipc/gpu_command_buffer_traits.cc rename to gpu/ipc/common/gpu_command_buffer_traits.cc index be302db6226668..f5d4728d2605fe 100644 --- a/gpu/ipc/gpu_command_buffer_traits.cc +++ b/gpu/ipc/common/gpu_command_buffer_traits.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "gpu/ipc/gpu_command_buffer_traits.h" +#include "gpu/ipc/common/gpu_command_buffer_traits.h" #include #include @@ -15,25 +15,25 @@ // Generate param traits size methods. #include "ipc/param_traits_size_macros.h" namespace IPC { -#include "gpu/ipc/gpu_command_buffer_traits_multi.h" +#include "gpu/ipc/common/gpu_command_buffer_traits_multi.h" } // namespace IPC // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "gpu/ipc/gpu_command_buffer_traits_multi.h" +#include "gpu/ipc/common/gpu_command_buffer_traits_multi.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "gpu/ipc/gpu_command_buffer_traits_multi.h" +#include "gpu/ipc/common/gpu_command_buffer_traits_multi.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "gpu/ipc/gpu_command_buffer_traits_multi.h" +#include "gpu/ipc/common/gpu_command_buffer_traits_multi.h" } // namespace IPC namespace IPC { diff --git a/gpu/ipc/gpu_command_buffer_traits.h b/gpu/ipc/common/gpu_command_buffer_traits.h similarity index 96% rename from gpu/ipc/gpu_command_buffer_traits.h rename to gpu/ipc/common/gpu_command_buffer_traits.h index a968f02fa633e0..1bf5314eb50646 100644 --- a/gpu/ipc/gpu_command_buffer_traits.h +++ b/gpu/ipc/common/gpu_command_buffer_traits.h @@ -7,8 +7,8 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/gpu_export.h" -#include "gpu/ipc/gpu_command_buffer_traits_multi.h" -#include "gpu/ipc/id_type_traits.h" +#include "gpu/ipc/common/gpu_command_buffer_traits_multi.h" +#include "gpu/ipc/common/id_type_traits.h" #include "ipc/ipc_message_utils.h" namespace gpu { diff --git a/gpu/ipc/gpu_command_buffer_traits_multi.h b/gpu/ipc/common/gpu_command_buffer_traits_multi.h similarity index 100% rename from gpu/ipc/gpu_command_buffer_traits_multi.h rename to gpu/ipc/common/gpu_command_buffer_traits_multi.h diff --git a/gpu/ipc/id_type_traits.h b/gpu/ipc/common/id_type_traits.h similarity index 100% rename from gpu/ipc/id_type_traits.h rename to gpu/ipc/common/id_type_traits.h diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn index a0748e8aa98aad..964175b4d40371 100644 --- a/ppapi/BUILD.gn +++ b/ppapi/BUILD.gn @@ -137,7 +137,7 @@ test("ppapi_unittests") { deps = [ "//base/test:run_all_unittests", "//base/test:test_support", - "//gpu/ipc", + "//gpu/ipc/common", "//ipc", "//ipc:test_support", "//media:shared_memory_support", diff --git a/ppapi/native_client/BUILD.gn b/ppapi/native_client/BUILD.gn index 5c49d1e4ae2ed3..96edfb0b48ba7e 100644 --- a/ppapi/native_client/BUILD.gn +++ b/ppapi/native_client/BUILD.gn @@ -19,7 +19,7 @@ if (is_nacl) { "//gpu/command_buffer/client", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/common", - "//gpu/ipc", + "//gpu/ipc/common", "//ipc", "//media:shared_memory_support", "//native_client/src/shared/gio", diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 042ed444dfb5d8..a6eed4dc898c10 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -84,7 +84,7 @@ }, 'dependencies': [ '../base/base.gyp:base', - '../gpu/gpu.gyp:gpu_ipc', + '../gpu/gpu.gyp:gpu_ipc_common', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', 'ppapi.gyp:ppapi_c', @@ -108,7 +108,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../gin/gin.gyp:gin', '../gpu/gpu.gyp:gles2_implementation', - '../gpu/gpu.gyp:gpu_ipc', + '../gpu/gpu.gyp:gpu_ipc_common', '../media/media.gyp:shared_memory_support', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', @@ -156,7 +156,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../gin/gin.gyp:gin', '../gpu/gpu.gyp:gles2_implementation', - '../gpu/gpu.gyp:gpu_ipc', + '../gpu/gpu.gyp:gpu_ipc_common', '../media/media.gyp:shared_memory_support', '../ipc/ipc.gyp:ipc', '../skia/skia.gyp:skia', @@ -240,12 +240,12 @@ 'dependencies': [ '../base/base.gyp:base_win64', '../ipc/ipc.gyp:ipc_win64', - '../gpu/gpu.gyp:gpu_ipc_win64', + '../gpu/gpu.gyp:gpu_ipc_common_win64', 'ppapi.gyp:ppapi_c', 'ppapi_shared_win64', ], 'export_dependent_settings': [ - '../gpu/gpu.gyp:gpu_ipc_win64', + '../gpu/gpu.gyp:gpu_ipc_common_win64', ], 'defines': [ '<@(nacl_win64_defines)', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index f8ab6f6ed1019b..a2ee7f08057ace 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -200,7 +200,7 @@ 'ppapi_unittest_shared', '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', - '../gpu/gpu.gyp:gpu_ipc', + '../gpu/gpu.gyp:gpu_ipc_common', '../ipc/ipc.gyp:ipc', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:shared_memory_support', diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn index 9167f8826e9434..79ab6855ab84a1 100644 --- a/ppapi/proxy/BUILD.gn +++ b/ppapi/proxy/BUILD.gn @@ -279,7 +279,7 @@ component("proxy") { deps = [ "//base", "//gpu/command_buffer/client:gles2_implementation", - "//gpu/ipc", + "//gpu/ipc/common", "//ipc", "//media:shared_memory_support", "//ppapi/c", @@ -343,7 +343,7 @@ source_set("ipc_sources") { deps = [ "//base", - "//gpu/ipc", + "//gpu/ipc/common", "//ipc", "//ppapi/c", "//ppapi/shared_impl", diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index ebaeed90f1a419..a30c175840f67f 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -20,7 +20,7 @@ #include "gpu/command_buffer/common/command_buffer_id.h" #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/sync_token.h" -#include "gpu/ipc/gpu_command_buffer_traits.h" +#include "gpu/ipc/common/gpu_command_buffer_traits.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h"