Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: Source/bindings/scripts/generate_global_constructors.py

Issue 261243002: Add support for [Global] / [PrimaryGlobal] IDL extended attributes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove non-ASCII character in comment Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/bindings/scripts/generate_global_constructors.py
diff --git a/Source/bindings/scripts/generate_global_constructors.py b/Source/bindings/scripts/generate_global_constructors.py
index 3889f132077826bf8919a616c33eef62c38aeb03..7504b09d3990c6a41d59d9a269e2b39f916f5459 100755
--- a/Source/bindings/scripts/generate_global_constructors.py
+++ b/Source/bindings/scripts/generate_global_constructors.py
@@ -22,9 +22,11 @@ import os
import re
import sys
+from collections import defaultdict
from utilities import get_file_contents, write_file, get_interface_extended_attributes_from_idl, is_callback_interface_from_idl
-global_objects = {}
+global_name_to_interface_names = defaultdict(list)
+global_name_to_constructors = defaultdict(list)
HEADER_FORMAT = """
@@ -49,13 +51,22 @@ def parse_options():
return options, args
-# Global name: http://heycam.github.io/webidl/#dfn-global-name
-# FIXME: We should add support for [Global=xx] extended attribute instead of
-# hard-coding this mapping.
-def global_name_to_interface_name(global_name):
- if global_name.endswith('Worker'):
- return global_name + 'GlobalScope'
- return global_name
+# If the [Global] or [PrimaryGlobal] extended attribute is declared with an
Nils Barth (inactive) 2014/05/07 01:55:57 Could you put this explanation in a docstring inst
Inactive 2014/05/07 15:45:12 Done.
+# identifier list argument, then those identifiers are the interface's global
+# names; otherwise, the interface has a single global name, which is the
+# interface's identifier.
+# http://heycam.github.io/webidl/#Global
+def interface_to_global_names(interface_name, extended_attributes):
+ for extended_attribute in ['Global', 'PrimaryGlobal']:
Nils Barth (inactive) 2014/05/07 01:55:57 |key| is fine for the name here
Inactive 2014/05/07 15:45:12 Done.
+ global_value = extended_attributes.get(extended_attribute)
Nils Barth (inactive) 2014/05/07 01:55:57 Could you flatten this logic? I generally prefer
Inactive 2014/05/07 15:45:12 Done.
+ if global_value is not None:
+ if len(global_value) > 0:
+ # FIXME: In spec names are comma-separated, but that makes parsing very
+ # difficult (https://www.w3.org/Bugs/Public/show_bug.cgi?id=24959).
+ return global_value.split('&')
+ else:
+ return [interface_name]
+ return []
def record_global_constructors(idl_filename):
@@ -73,13 +84,22 @@ def record_global_constructors(idl_filename):
'NoInterfaceObject' in extended_attributes):
return
+ # Check if interface has [Global] / [PrimaryGlobal] extended attributes.
+ global_names = interface_to_global_names(interface_name, extended_attributes)
+ for global_name in global_names:
+ global_name_to_interface_names[global_name].append(interface_name)
+
+ # The [Exposed] extended attribute MUST take an identifier list. Each
+ # identifier in the list MUST be a global name. An interface or interface
+ # member the extended attribute applies to will be exposed only on objects
+ # associated with ECMAScript global environments whose global object
+ # implements an interface that has a matching global name.
# FIXME: In spec names are comma-separated, but that makes parsing very
# difficult (https://www.w3.org/Bugs/Public/show_bug.cgi?id=24959).
- global_names = extended_attributes.get('Exposed', 'Window').split('&')
+ exposed_global_names = extended_attributes.get('Exposed', 'Window').split('&')
new_constructors_list = generate_global_constructors_list(interface_name, extended_attributes)
- for global_name in global_names:
- interface_name = global_name_to_interface_name(global_name)
- global_objects[interface_name]['constructors'].extend(new_constructors_list)
+ for exposed_global_name in exposed_global_names:
+ global_name_to_constructors[exposed_global_name].extend(new_constructors_list)
def generate_global_constructors_list(interface_name, extended_attributes):
@@ -139,23 +159,32 @@ def main():
# these are in the build directory, which is determined at build time, not
# GYP time.
# These are passed as pairs of GlobalObjectName, GlobalObject.idl
- interface_name_idl_filename = [(args[i], args[i + 1])
- for i in range(0, len(args), 2)]
- global_objects.update(
- (interface_name, {
- 'idl_filename': idl_filename,
- 'constructors': [],
- })
- for interface_name, idl_filename in interface_name_idl_filename)
+ interface_name_to_idl_filename = {args[i]: args[i + 1]
Nils Barth (inactive) 2014/05/07 01:55:57 Need to use dict(...) instead of {...: ...}: dicti
Inactive 2014/05/07 15:45:12 Done.
+ for i in range(0, len(args), 2)}
for idl_filename in idl_files:
record_global_constructors(idl_filename)
- for interface_name, global_object in global_objects.iteritems():
+ # An interface can have multiple global names (e.g.
Nils Barth (inactive) 2014/05/07 01:55:57 This is really confusing; I think it's because of
Inactive 2014/05/07 15:45:12 Done.
+ # Global=Worker&SharedWorker) so we construct a
+ # interface_name_to_constructors dict from global_name_to_constructors and
+ # global_name_to_interface_names.
+ interface_name_to_constructors = defaultdict(list)
+ for global_name, constructors in global_name_to_constructors.iteritems():
+ assert global_name in global_name_to_interface_names, \
Nils Barth (inactive) 2014/05/07 01:55:57 This assert is not needed, since it'll trigger an
Inactive 2014/05/07 15:45:12 Done.
+ 'Unknown global name: "%s", values in [Exposed=xx] must '\
+ 'correspond to a [Global] or [PrimaryGlobal] extended '\
+ 'attribute.' % global_name
+ for interface_name in global_name_to_interface_names[global_name]:
+ interface_name_to_constructors[interface_name].extend(constructors)
+
+ # Write partial interfaces containing constructor attributes for each
+ # global interface.
+ for interface_name, constructors in interface_name_to_constructors.iteritems():
Nils Barth (inactive) 2014/05/07 01:55:57 for interface_name, idl_filename in interface_name
Inactive 2014/05/07 15:45:12 Done.
write_global_constructors_partial_interface(
interface_name,
- global_object['idl_filename'],
- global_object['constructors'],
+ interface_name_to_idl_filename[interface_name],
Nils Barth (inactive) 2014/05/07 01:55:57 How about: interface_name, idl_filename, interface
Inactive 2014/05/07 15:45:12 Done.
+ constructors,
options.write_file_only_if_changed)

Powered by Google App Engine
This is Rietveld 408576698