| Index: third_party/WebKit/Source/build/scripts/make_internal_settings.py
|
| diff --git a/third_party/WebKit/Source/build/scripts/make_internal_settings.py b/third_party/WebKit/Source/build/scripts/make_internal_settings.py
|
| index abaef7b86405669598340b2b7237b86371c83fa4..b9999fb15781bece38e4299834a3ea483203cedc 100755
|
| --- a/third_party/WebKit/Source/build/scripts/make_internal_settings.py
|
| +++ b/third_party/WebKit/Source/build/scripts/make_internal_settings.py
|
| @@ -29,29 +29,23 @@
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| import sys
|
| -import in_generator
|
| +import json5_generator
|
| import template_expander
|
| import name_utilities
|
| from make_settings import to_passing_type, to_idl_type
|
|
|
|
|
| -class MakeInternalSettingsWriter(in_generator.Writer):
|
| - defaults = {
|
| - 'type': 'bool',
|
| - 'initial': None,
|
| - 'invalidate': None,
|
| - }
|
| - default_parameters = {}
|
| +class MakeInternalSettingsWriter(json5_generator.Writer):
|
| filters = {
|
| 'upper_first': name_utilities.upper_first,
|
| 'to_passing_type': to_passing_type,
|
| 'to_idl_type': to_idl_type,
|
| }
|
|
|
| - def __init__(self, in_file_path):
|
| - super(MakeInternalSettingsWriter, self).__init__(in_file_path)
|
| + def __init__(self, json5_file_path):
|
| + super(MakeInternalSettingsWriter, self).__init__(json5_file_path)
|
|
|
| - self.in_file.name_dictionaries.sort(key=lambda entry: entry['name'])
|
| + self.json5_file.name_dictionaries.sort(key=lambda entry: entry['name'])
|
|
|
| self._outputs = {
|
| ('InternalSettingsGenerated.h'): self.generate_header,
|
| @@ -59,7 +53,7 @@ class MakeInternalSettingsWriter(in_generator.Writer):
|
| ('InternalSettingsGenerated.idl'): self.generate_idl,
|
| }
|
| self._template_context = {
|
| - 'settings': self.in_file.name_dictionaries,
|
| + 'settings': self.json5_file.name_dictionaries,
|
| }
|
|
|
| @template_expander.use_jinja('InternalSettingsGenerated.h.tmpl', filters=filters)
|
| @@ -76,4 +70,4 @@ class MakeInternalSettingsWriter(in_generator.Writer):
|
|
|
|
|
| if __name__ == '__main__':
|
| - in_generator.Maker(MakeInternalSettingsWriter).main(sys.argv)
|
| + json5_generator.Maker(MakeInternalSettingsWriter).main(sys.argv)
|
|
|