Make a function to query whether a CSSPropertyID is valid and whether it has a name.

third_party/WebKit/Source/build/scripts/make_css_property_names.py

 #!/usr/bin/env python
 
 import subprocess
 import sys
 
 import css_properties
 import in_generator
 import license
 
 
@@ skipping 26 matching lines @@
 const int numCSSProperties = %(properties_count)s;
 const int lastCSSProperty = %(last_property_id)d;
 const int lastUnresolvedCSSProperty = %(last_unresolved_property_id)d;
 const size_t maxCSSPropertyNameLength = %(max_name_length)d;
 
 const char* getPropertyName(CSSPropertyID);
 const WTF::AtomicString& getPropertyNameAtomicString(CSSPropertyID);
 WTF::String getPropertyNameString(CSSPropertyID);
 WTF::String getJSPropertyName(CSSPropertyID);
 
+inline bool propertyHasName(int id)
+{
+    return id >= firstCSSProperty && id <= lastUnresolvedCSSProperty;
+}
+
+
 inline CSSPropertyID convertToCSSPropertyID(int value)
 {
-    ASSERT(value >= CSSPropertyInvalid && value <= lastCSSProperty);
+    DCHECK_GE(value, CSSPropertyInvalid);
+    DCHECK_LE(value, lastCSSProperty);

[sashab, 2016/08/15 07:23:13]

Maybe DCHECK(propertyHasName() || property == CSSPropertyInvalid)?

[meade_UTC10, 2016/09/29 07:39:56]

Done.

[meade_UTC10, 2016/09/30 06:17:37]

Actually that doesn't work - lastCSSProperty != lastUnresolvedCSSProperty :)
I reverted my change for this comment.

     return static_cast<CSSPropertyID>(value);
 }
 
 inline CSSPropertyID resolveCSSPropertyID(CSSPropertyID id)
 {
     return convertToCSSPropertyID(id & ~512);
 }
 
 inline bool isPropertyAlias(CSSPropertyID id) { return id & 512; }
 
@@ skipping 51 matching lines @@
 %%%%
 %(property_to_enum_map)s
 %%%%
 const Property* findProperty(register const char* str, register unsigned int len)
 {
     return %(class_name)sHash::findPropertyImpl(str, len);
 }
 
 const char* getPropertyName(CSSPropertyID id)
 {
-    ASSERT(id >= firstCSSProperty && id <= lastUnresolvedCSSProperty);
+    DCHECK(propertyHasName(id));
     int index = id - firstCSSProperty;
     return propertyNameStringsPool + propertyNameStringsOffsets[index];
 }
 
 const AtomicString& getPropertyNameAtomicString(CSSPropertyID id)
 {
-    ASSERT(id >= firstCSSProperty && id <= lastUnresolvedCSSProperty);
+    DCHECK(propertyHasName(id));
     int index = id - firstCSSProperty;
     static AtomicString* propertyStrings = new AtomicString[lastUnresolvedCSSProperty]; // Intentionally never destroyed.
     AtomicString& propertyString = propertyStrings[index];
     if (propertyString.isNull())
         propertyString = AtomicString(propertyNameStringsPool + propertyNameStringsOffsets[index]);
     return propertyString;
 }
 
 String getPropertyNameString(CSSPropertyID id)
 {
@@ skipping 80 matching lines @@
         # FIXME: If we could depend on Python 2.7, we would use subprocess.check_output
         gperf_args = [self.gperf_path, '--key-positions=*', '-P', '-n']
         gperf_args.extend(['-m', '50'])  # Pick best of 50 attempts.
         gperf_args.append('-D')  # Allow duplicate hashes -> More compact code.
         gperf = subprocess.Popen(gperf_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
         return gperf.communicate(gperf_input)[0]
 
 
 if __name__ == "__main__":
     in_generator.Maker(CSSPropertyNamesWriter).main(sys.argv)