diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 15:05:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:33:47 +0000 |
commit | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (patch) | |
tree | d55b4003bde34d7d05f558f02cfd82b2a66a7aac /chromium/third_party/blink/renderer/build/scripts/make_event_factory.py | |
parent | 2b94bfe47ccb6c08047959d1c26e392919550e86 (diff) | |
download | qtwebengine-chromium-e684a3455bcc29a6e3e66a004e352dea4e1141e7.tar.gz |
BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0
Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/build/scripts/make_event_factory.py')
-rwxr-xr-x | chromium/third_party/blink/renderer/build/scripts/make_event_factory.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/build/scripts/make_event_factory.py b/chromium/third_party/blink/renderer/build/scripts/make_event_factory.py index d509a3e8d42..a941cc0a793 100755 --- a/chromium/third_party/blink/renderer/build/scripts/make_event_factory.py +++ b/chromium/third_party/blink/renderer/build/scripts/make_event_factory.py @@ -91,6 +91,7 @@ def measure_name(name): class EventFactoryWriter(json5_generator.Writer): default_parameters = { 'ImplementedAs': {}, + 'interfaceHeaderDir': {}, 'RuntimeEnabled': {}, } default_metadata = { @@ -100,7 +101,7 @@ class EventFactoryWriter(json5_generator.Writer): } filters = { 'cpp_name': name_utilities.cpp_name, - 'script_name': name_utilities.script_name, + 'name': lambda entry: entry['name'].original, 'create_event_whitelist': create_event_whitelist, 'create_event_measure_whitelist': create_event_measure_whitelist, 'measure_name': measure_name, @@ -109,7 +110,7 @@ class EventFactoryWriter(json5_generator.Writer): def __init__(self, json5_file_path, output_dir): super(EventFactoryWriter, self).__init__(json5_file_path, output_dir) self.namespace = self.json5_file.metadata['namespace'].strip('"') - assert self.namespace == 'Event', 'namespace field should be "Event".' + assert self.namespace == 'event_interface_names', 'namespace field should be "event_interface_names".' self.suffix = self.json5_file.metadata['suffix'].strip('"') snake_suffix = (self.suffix.lower() + '_') if self.suffix else '' self._outputs = { @@ -121,14 +122,10 @@ class EventFactoryWriter(json5_generator.Writer): exit(1) def _headers_header_include_path(self, entry): - path = os.path.dirname(entry['name'].original) + path = entry['interfaceHeaderDir'] if len(path): path += '/' - if entry['ImplementedAs']: - path += self.get_file_basename(entry['ImplementedAs']) - else: - path += self.get_file_basename(os.path.basename(entry['name'].original)) - return path + '.h' + return path + self.get_file_basename(name_utilities.cpp_name(entry)) + '.h' def _headers_header_includes(self, entries): includes = dict() |