Commit de283688 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

blinkbuild: Use NameStyleConverter in enum_for_css_keyword(),...

blinkbuild: Use NameStyleConverter in enum_for_css_keyword(), enum_for_css_property(), and enum_for_css_property_alias().

We'd like to reduce the usage of _upper_camel_case().

enum_for_css_keyword() and enum_for_css_property() accept a str or a
NameStyleConveter instance as an argument because their multiple
callsites have only strings, and creating NameStyleConveter in callsites
would make the code noisy.

The generated code won't be changed at all.

Bug: 843927
Change-Id: I64f7bb81f24a0d5caab1d81b477fcaab561bca9f
Reviewed-on: https://chromium-review.googlesource.com/1077714
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarHitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#562760}
parent 554991de
......@@ -164,7 +164,7 @@ class CSSProperties(object):
updated_alias['alias_for'] = alias['alias_for']
updated_alias['aliased_property'] = aliased_property['name'].to_upper_camel_case()
updated_alias['property_id'] = enum_for_css_property_alias(
alias['name'].original)
alias['name'])
updated_alias['enum_value'] = aliased_property['enum_value'] + \
self._alias_offset
self._aliases[i] = updated_alias
......@@ -175,12 +175,12 @@ class CSSProperties(object):
property_[key] = value
# Basic info.
name = property_['name'].original
name = property_['name']
property_['property_id'] = enum_for_css_property(name)
property_['is_internal'] = name.startswith('-internal-')
property_['is_internal'] = name.original.startswith('-internal-')
method_name = property_['name_for_methods']
if not method_name:
method_name = property_['name'].to_upper_camel_case().replace('Webkit', '')
method_name = name.to_upper_camel_case().replace('Webkit', '')
set_if_none(property_, 'inherited', False)
# Initial function, Getters and Setters for ComputedStyle.
......
......@@ -25,7 +25,7 @@ class CSSValueKeywordsWriter(json5_generator.Writer):
first_keyword_id = 1
for offset, keyword in enumerate(self._value_keywords):
keyword['lower_name'] = keyword['name'].original.lower()
keyword['enum_name'] = enum_for_css_keyword(keyword['name'].original)
keyword['enum_name'] = enum_for_css_keyword(keyword['name'])
keyword['enum_value'] = first_keyword_id + offset
if keyword['name'].original.startswith('-internal-'):
assert keyword['mode'] is None, 'Can\'t specify mode for ' \
......
......@@ -29,7 +29,7 @@
import os.path
import re
from blinkbuild.name_style_converter import tokenize_name
from blinkbuild.name_style_converter import NameStyleConverter, tokenize_name
def upper_first_letter(name):
......@@ -58,15 +58,17 @@ def cpp_name(entry):
def enum_for_css_keyword(keyword):
return 'CSSValue' + _upper_camel_case(keyword)
converter = NameStyleConverter(keyword) if type(keyword) is str else keyword
return 'CSSValue' + converter.to_upper_camel_case()
def enum_for_css_property(property_name):
return 'CSSProperty' + _upper_camel_case(property_name)
converter = NameStyleConverter(property_name) if type(property_name) is str else property_name
return 'CSSProperty' + converter.to_upper_camel_case()
def enum_for_css_property_alias(property_name):
return 'CSSPropertyAlias' + _upper_camel_case(property_name)
return 'CSSPropertyAlias' + property_name.to_upper_camel_case()
# FIXME: Merge these with the above methods.
# and update all the generators to use these ones.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment