IDL build: Split global object computation into core and modules

Source/bindings/modules/generated.gyp

 # 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.
 
 # Generate IDL interfaces info for modules, used to generate bindings
 #
 # Design doc: http://www.chromium.org/developers/design-documents/idl-build
 
 {
   'includes': [
@@ skipping 116 matching lines @@
           '../../build/scripts/make_names.py',
           '../../modules/EventTargetModulesFactory.in',
           '--output_dir',
           '<(SHARED_INTERMEDIATE_DIR)/blink',
         ],
       },
     ],
   },
 ################################################################################
   {
+    'target_name': 'modules_global_objects',
+    'type': 'none',
+    'dependencies': [
+        '../core/generated.gyp:core_global_objects',
+    ],
+    'actions': [{
+      'action_name': 'compute_modules_global_objects',
+      'inputs': [
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '<(bindings_scripts_dir)/utilities.py',
+        # Only look in main IDL files (exclude dependencies and testing,
+        # which should not define global objects).
+        '<(modules_idl_files_list)',
+        '<@(modules_idl_files)',
+      ],
+      'outputs': [
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
+      ],
+      'action': [
+        'python',
+        '<(bindings_scripts_dir)/compute_global_objects.py',
+        '--idl-files-list',
+        '<(modules_idl_files_list)',
+        '--write-file-only-if-changed',
+        '<(write_file_only_if_changed)',
+        '--',
+        '<(bindings_core_output_dir)/GlobalObjectsCore.pickle',

[haraken, 2014/06/05 03:05:10]

Do we need GlobalObjectsCore.pickle?

[Nils Barth (inactive), 2014/06/05 03:10:53]

Yes: it's global objects defined in core, and is needed for componentization,
since core shouldn't know about global objects defined elsewhere.
It's analogous to InterfacesInfoCore*

[Nils Barth (inactive), 2014/06/05 03:23:58]

For example, I'll be using it directly in the followup CL!
IDL build: remove dependency core global constructors → modules global objects
https://codereview.chromium.org/319593006/
...specifically:
https://codereview.chromium.org/319593006/diff/1/Source/bindings/core/generat...

+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
+       ],
+       'message': 'Computing global objects in modules',
+      }]
+  },
+################################################################################
+  {
     'target_name': 'modules_global_constructors_idls',
     'type': 'none',
     'dependencies': [
-        # FIXME: should be modules_global_objects http://crbug.com/358074
-        '../generated.gyp:global_objects',
+        'modules_global_objects',
     ],
     'actions': [{
       'action_name': 'generate_modules_global_constructors_idls',
       'inputs': [
         '<(bindings_scripts_dir)/generate_global_constructors.py',
         '<(bindings_scripts_dir)/utilities.py',
         # Only includes main IDL files (exclude dependencies and testing,
         # which should not appear on global objects).
         '<(modules_idl_files_list)',
         '<@(modules_idl_files)',
-        '<(bindings_output_dir)/GlobalObjects.pickle',
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
       ],
       'outputs': [
         '<@(modules_global_constructors_generated_idl_files)',
         '<@(modules_global_constructors_generated_header_files)',
       ],
       'action': [
         'python',
         '<(bindings_scripts_dir)/generate_global_constructors.py',
         '--idl-files-list',
         '<(modules_idl_files_list)',
         '--global-objects-file',
-        '<(bindings_output_dir)/GlobalObjects.pickle',
+        '<(bindings_modules_output_dir)/GlobalObjectsModules.pickle',
         '--write-file-only-if-changed',
         '<(write_file_only_if_changed)',
         '--',
         'Window',
         '<(blink_modules_output_dir)/WindowModulesConstructors.idl',
         'SharedWorkerGlobalScope',
         '<(blink_modules_output_dir)/SharedWorkerGlobalScopeModulesConstructors.idl',
         'DedicatedWorkerGlobalScope',
         '<(blink_modules_output_dir)/DedicatedWorkerGlobalScopeModulesConstructors.idl',
         'ServiceWorkerGlobalScope',
@@ skipping 67 matching lines @@
         '<(bindings_core_output_dir)/InterfacesInfoCoreIndividual.pickle',
         '<(bindings_modules_output_dir)/InterfacesInfoModulesIndividual.pickle',
         '<(bindings_modules_output_dir)/InterfacesInfoModules.pickle',
       ],
       'message': 'Computing overall global information about IDL files',
       }]
   },
 ################################################################################
   ],  # targets
 }