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}
Denger-Network · Mar 5, 2016 · ef5a0b6 · ef5a0b6
1 parent 7c864e2
commit ef5a0b6
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 141 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
diff --git 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 → gpu/ipc/common/DEPS b/gpu/ipc/DEPS → gpu/ipc/common/DEPS
diff --git a/gpu/ipc/OWNERS → gpu/ipc/common/OWNERS b/gpu/ipc/OWNERS → gpu/ipc/common/OWNERS
diff --git a/gpu/ipc/gpu_command_buffer_traits.cc → gpu/ipc/common/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc → 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 <stddef.h>
 #include <stdint.h>
@@ -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 → gpu/ipc/common/gpu_command_buffer_traits.h b/gpu/ipc/gpu_command_buffer_traits.h → 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 → .../common/gpu_command_buffer_traits_multi.h b/gpu/ipc/gpu_command_buffer_traits_multi.h → .../common/gpu_command_buffer_traits_multi.h
diff --git a/gpu/ipc/id_type_traits.h → gpu/ipc/common/id_type_traits.h b/gpu/ipc/id_type_traits.h → gpu/ipc/common/id_type_traits.h
diff --git 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
@@ -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",