Organize typemaps in Blink

third_party/WebKit/public/blink.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #         * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #         * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
             'platform/modules/permissions/permission_status.mojom',
             'platform/modules/presentation/presentation.mojom',
             'platform/modules/serviceworker/service_worker_event_status.mojom',
             'platform/modules/wake_lock/wake_lock_service.mojom',
             'platform/modules/webshare/webshare.mojom',
         ],
         # Duplicated in GN: //third_party/WebKit/public:android_mojo_bindings
         'blink_android_mojo_sources': [
             'platform/modules/payments/payment_request.mojom',
         ],
+        'blink_typemap_sources': [
+            '<(DEPTH)/cc/ipc/surface_id.typemap',
+            '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+        ],
     },
     'targets': [
         {
             # GN version: //third_party/WebKit/public:blink
             'target_name': 'blink',
             'type': 'none',
             'dependencies': [
                 'mojo_bindings',
                 '../Source/platform/blink_platform.gyp:blink_platform',
                 '../Source/web/web.gyp:blink_web',
@@ skipping 44 matching lines @@
             # GN version: //third_party/WebKit/public:mojo_bindings_blink
             # (generated by //third_party/WebKit/public:mojo_bindings)
             'target_name': 'mojo_bindings_blink_mojom',
             'type': 'none',
             'variables': {
                 'mojom_files': [
                     '<@(blink_mojo_sources)',
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
-
+                    '<@(blink_typemap_sources)',
                 ],
                 'for_blink': 'true',
                 'use_new_wrapper_types': 'false',
             },
             'dependencies' : [
                 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
             ],
-            'includes': [
+           'includes': [

[jbroman, 2016/07/22 18:05:00]

nit: fix the indentation here please

                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },
         {
             # GN version: //third_party/WebKit/public:mojo_bindings
             'target_name': 'mojo_bindings_mojom',
             'type': 'none',
             'variables': {
                 'mojom_files': [
                     '<@(blink_mojo_sources)',
                     '<@(blink_android_mojo_sources)',
                 ],
                 'mojom_typemaps': [
-                  '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
-                    '<(DEPTH)/cc/ipc/surface_id.typemap',
-                    '<(DEPTH)/cc/ipc/surface_sequence.typemap',
+                    '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
+                    '<@(blink_typemap_sources)',
                 ],
                 'use_new_wrapper_types': 'false',
             },
             'dependencies' : [
                 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
             ],
-            'includes': [
+           'includes': [

[jbroman, 2016/07/22 18:05:00]

and here

                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },
         {
             # GN version: //third_party/WebKit/public:mojo_bindings
             'target_name': 'mojo_bindings',
             # Needed because of dependency on generated headers.
             'hard_dependency': '1',
             'type': 'static_library',
             'dependencies': [
@@ skipping 26 matching lines @@
                     'type': 'static_library',
                     'dependencies': [
                         'android_mojo_bindings_mojom',
                         '../../../mojo/mojo_public.gyp:mojo_bindings_java',
                     ],
                 },
             ],
         }],
     ],
 }