Clean up type handling in make_computed_style_base.py.

third_party/WebKit/Source/core/css/CSSProperties.json5

 {
 // This file specifies all the CSS properties we support and the necessary
 // information for our code generation. The various supported arguments
 // are described below with example usage
 
   parameters: {
     // - alias_for: "other-property"
     // Properties specifying alias_for should be virtually identical to the
     // properties they alias. Minor parsing differences are allowed as long as
     // the CSSValues created are of the same format of the aliased property.
@@ skipping 37 matching lines @@
     // in the .h file for this property, and also used in CSSPropertyAPIFiles.h.tmpl to
     // generate declarations for only the methods this property has implementations for.
     api_methods: {
       default: [],
       valid_type: "list",
        // This list must be an ordered, complete list of methods whose names match those
        // defined in CSSPropertyDescriptor.h.
       valid_values: ["parseSingleValue", "parseShorthand"],
     },
 
-    // - keyword_only
-    // These properties only store keyword values. This is used when
-    // generating the ComputedStyle storage for the property. The initial
-    // value for this property on a ComputedStyle is specified with the
-    // initial_keyword flag below.
-    // TODO(sashab): Rename this to field_type=keyword once we support
-    // multiple types of generatable fields in ComputedStyle
+    // - field_template
+    // Affects how this field is generated in terms of storage and getter/setter methods.
+    // - 'keyword' fields are generated as enums stored in a bitfield.
     // TODO(sashab, meade): Remove this once TypedOM types are specified for
     // every property, since this value can be inferred from that.
-    keyword_only: {
-      default: false,
-      valid_type: "bool",
+    field_template: {
+      valid_values: [
+        "keyword", // Field can take on one of several keyword values. Stored as enum.
+      ],
     },
 
-    // - field_storage_type: "path/to/Type"
+    // - field_type_path: "path/to/Type"
     // For properties that have generated field storage in ComputedStyle,
     // this optional argument will override the field's generated type with
     // an external one specified at the given path. The type must be defined
     // in a header file at that path, and have the same name as the file.
     // Currently, only enum types are supported, and the enum's only values
     // must be CamelCase values of the keywords of the property.
-    field_storage_type: {
+    field_type_path: {
     },
 
     // - keywords: ["keyword1", "keyword2"]
     // This specifies all valid keyword values for the property.
     // TODO(sashab): Once all properties are represented here, delete
     // CSSValueKeywords.in and use this list instead.
     keywords: {
       default: [],
     },
 
     // - initial_keyword: "keyword-value"
-    // This specifies the initial keyword value for the keyword_only
-    // property.
+    // This specifies the initial keyword value for the keyword fields.
     initial_keyword: {
     },
 
     // Flags which go into CSSOMTypes:
     // - typedom_types: ["Type", "OtherType"]
     // The property can take types specified in typedom_types for CSS Typed OM.
     // Keyword does not need to be specified as every property can take keywords.
     // - repeated
     // The property supports a list of values.
     // - supports_percentage
@@ skipping 218 matching lines @@
     {
       name: "color",
       custom_all: true,
       inherited: true,
       interpolable: true,
       priority: "High",
     },
     {
       name: "direction",
       custom_value: true,
-      field_storage_type: "platform/text/TextDirection",
+      field_type_path: "platform/text/TextDirection",
       inherited: true,
       initial_keyword: "ltr",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["ltr", "rtl"],
       priority: "High",
     },
     {
       name: "font-family",
       converter: "convertFontFamily",
       font: true,
       inherited: true,
       name_for_methods: "FamilyDescription",
       priority: "High",
@@ skipping 129 matching lines @@
     {
       name: "-webkit-text-orientation",
       custom_value: true,
       inherited: true,
       priority: "High",
       type_name: "TextOrientation",
     },
     {
       name: "writing-mode",
       custom_value: true,
-      field_storage_type: "platform/text/WritingMode",
+      field_type_path: "platform/text/WritingMode",
       inherited: true,
       initial_keyword: "horizontal-tb",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["horizontal-tb", "vertical-rl", "vertical-lr"],
       priority: "High",
       type_name: "WritingMode",
     },
     {
       name: "-webkit-writing-mode",
       custom_value: true,
       inherited: true,
       priority: "High",
       type_name: "WritingMode",
@@ skipping 136 matching lines @@
       api_class: "CSSPropertyAPIBorderWidth",
       converter: "convertLineWidth<float>",
       initial: "initialBorderWidth",
       interpolable: true,
     },
     {
       name: "border-collapse",
       independent: true,
       inherited: true,
       initial_keyword: "separate",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["separate", "collapse"],
     },
     {
       name: "border-image-outset",
       api_class: "CSSPropertyAPIBorderImageOutset",
       custom_all: true,
       interpolable: true,
     },
     {
       name: "border-image-repeat",
@@ skipping 106 matching lines @@
       name: "box-shadow",
       converter: "convertShadowList",
       interpolable: true,
     },
     "box-sizing",
     {
       name: "break-after",
       // Storage for this property also covers these legacy properties:
       // page-break-after, -webkit-column-break-after
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "auto", "avoid", "avoid-column", "avoid-page", "column", "left", "page", "recto", "right", "verso"
       ],
       type_name: "EBreakBetween",
     },
     {
       name: "break-before",
       // Storage for this property also covers these legacy properties:
       // page-break-before, -webkit-column-break-before
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "auto", "avoid", "avoid-column", "avoid-page", "column", "left", "page", "recto", "right", "verso"
       ],
       type_name: "EBreakBetween",
     },
     {
       name: "break-inside",
       // Storage for this property also covers these legacy properties:
       // page-break-inside, -webkit-column-break-inside
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["auto", "avoid", "avoid-column", "avoid-page"],
     },
     {
       name: "buffered-rendering",
       svg: true,
     },
     {
       name: "caption-side",
       independent: true,
       inherited: true,
       initial_keyword: "top",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["top", "bottom", "left", "right"],
     },
     {
       name: "caret-color",
       api_class: true,
       api_methods: ["parseSingleValue"],
       custom_all: true,
       inherited: true,
       interpolable: true,
     },
     {
       name: "clear",
       initial_keyword: "none",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["none", "left", "right", "both"],
     },
     {
       name: "clip",
       api_class: true,
       api_methods: ["parseSingleValue"],
       converter: "convertClip",
       custom_all: true,
       interpolable: true,
     },
@@ skipping 86 matching lines @@
     {
       name: "dominant-baseline",
       inherited: true,
       svg: true,
     },
     {
       name: "empty-cells",
       independent: true,
       inherited: true,
       initial_keyword: "show",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["show", "hide"],
       type_name: "EEmptyCells",
     },
     {
       name: "fill",
       api_class: "CSSPropertyAPIPaintStroke",
       api_methods: ["parseSingleValue"],
       custom_all: true,
       inherited: true,
       interpolable: true,
@@ skipping 38 matching lines @@
     {
       name: "flex-shrink",
       api_class: "CSSPropertyAPIFlexGrowOrShrink",
       interpolable: true,
       type_name: "float",
     },
     "flex-wrap",
     {
       name: "float",
       initial_keyword: "none",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["none", "left", "right"],
       name_for_methods: "Floating",
       type_name: "EFloat",
     },
     {
       name: "flood-color",
       api_class: "CSSPropertyAPIColor",
       api_methods: ["parseSingleValue"],
       converter: "convertColor",
       interpolable: true,
@@ skipping 173 matching lines @@
       custom_value: true,
       inherited: true,
       interpolable: true,
       typedom_types: ["Image"],
     },
     {
       name: "list-style-position",
       independent: true,
       inherited: true,
       initial_keyword: "outside",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["outside", "inside"],
     },
     {
       name: "list-style-type",
       inherited: true,
       initial_keyword: "disc",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "disc", "circle", "square", "decimal", "decimal-leading-zero", "arabic-indic", "bengali", "cambodian", "khmer", "devanagari", "gujarati", "gurmukhi", "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian", "urdu", "telugu", "tibetan", "thai", "lower-roman", "upper-roman", "lower-greek", "lower-alpha", "lower-latin", "upper-alpha", "upper-latin", "cjk-earthly-branch", "cjk-heavenly-stem", "ethiopic-halehame", "ethiopic-halehame-am", "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "hangul", "hangul-consonant", "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal", "hebrew", "armenian", "lower-armenian", "upper-armenian", "georgian", "cjk-ideographic", "simp-chinese-formal", "simp-chinese-informal", "trad-chinese-formal", "trad-chinese-informal", "hiragana", "katakana", "hiragana-iroha", "katakana-iroha", "none",
       ],
     },
     {
       name: "margin-bottom",
       api_class: "CSSPropertyAPIMargin",
       api_methods: ["parseSingleValue"],
       converter: "convertQuirkyLength",
       initial: "initialMargin",
@@ skipping 195 matching lines @@
       api_class: true,
       api_methods: ["parseSingleValue"],
       converter: "convertLineWidth<unsigned short>",
       interpolable: true,
     },
     {
       name: "overflow-anchor",
       runtime_flag: "ScrollAnchoring",
       inherited: false,
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "visible", "none", "auto",
       ],
     },
     {
       name: "overflow-wrap",
       inherited: true,
     },
     {
       name: "overflow-x",
       initial_keyword: "visible",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "visible", "hidden", "scroll", "auto", "overlay", "-webkit-paged-x", "-webkit-paged-y",
       ],
       type_name: "EOverflow",
     },
     {
       name: "overflow-y",
       initial_keyword: "visible",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "visible", "hidden", "scroll", "auto", "overlay", "-webkit-paged-x", "-webkit-paged-y",
       ],
       type_name: "EOverflow",
     },
     {
       name: "padding-bottom",
       api_class: "CSSPropertyAPIPadding",
       api_methods: ["parseSingleValue"],
       converter: "convertLength",
@@ skipping 41 matching lines @@
     {
       name: "perspective-origin",
       converter: "convertPosition",
       interpolable: true,
     },
     {
       name: "pointer-events",
       independent: true,
       inherited: true,
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "none", "auto", "stroke", "fill", "painted", "visible", "visibleStroke", "visibleFill", "visiblePainted", "bounding-box", "all",
       ],
     },
     {
       name: "position",
       custom_inherit: true,
     },
     {
       name: "quotes",
@@ skipping 199 matching lines @@
       name: "stroke-width",
       api_class: "CSSPropertyAPIStrokeOrLength",
       converter: "convertUnzoomedLength",
       inherited: true,
       interpolable: true,
       svg: true,
     },
     {
       name: "table-layout",
       initial_keyword: "auto",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "auto", "fixed"
       ]
     },
     {
       name: "tab-size",
       api_class: true,
       api_methods: ["parseSingleValue"],
       converter: "convertLengthOrTabSpaces",
       inherited: true,
       type_name: "TabSize",
     },
     {
       name: "text-align",
       custom_value: true,
       inherited: true,
       initial_keyword: "start",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "left", "right", "center", "justify", "webkitLeft", "webkitRight", "webkitCenter", "start", "end",
       ],
     },
     {
       name: "text-align-last",
       inherited: true,
       type_name: "TextAlignLast",
     },
     {
@@ skipping 75 matching lines @@
       api_methods: ["parseSingleValue"],
       converter: "convertTextSizeAdjust",
       inherited: true,
       type_name: "TextSizeAdjust",
     },
     {
       name: "text-transform",
       independent: true,
       inherited: true,
       initial_keyword: "none",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["capitalize", "uppercase", "lowercase", "none"],
     },
     {
       name: "text-underline-position",
       api_class: true,
       api_methods: ["parseSingleValue"],
       inherited: true,
       runtime_flag: "CSS3TextDecorations",
       type_name: "TextUnderlinePosition",
     },
@@ skipping 52 matching lines @@
     {
       name: "scale",
       api_class: true,
       api_methods: ["parseSingleValue"],
       converter: "convertScale",
       interpolable: true,
       runtime_flag: "CSSIndependentTransformProperties",
     },
     {
       name: "unicode-bidi",
-      field_storage_type: "platform/text/UnicodeBidi",
+      field_type_path: "platform/text/UnicodeBidi",
       initial_keyword: "normal",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: [
         "normal", "embed", "bidi-override", "isolate", "plaintext", "isolate-override",
       ],
       type_name: "UnicodeBidi",
     },
     {
       name: "vector-effect",
       svg: true,
     },
     {
       name: "vertical-align",
       api_class: true,
       api_methods: ["parseSingleValue"],
       custom_inherit: true,
       custom_value: true,
       interpolable: true,
     },
     {
       name: "visibility",
       independent: true,
       inherited: true,
       initial_keyword: "visible",
       interpolable: true,
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["visible", "hidden", "collapse"],
     },
     {
       name: "x",
       api_class: "CSSPropertyAPIStrokeOrLength",
       converter: "convertLength",
       interpolable: true,
       svg: true,
     },
     {
@@ skipping 44 matching lines @@
     {
       name: "-webkit-box-align",
       type_name: "EBoxAlignment",
     },
     "-webkit-box-decoration-break",
     {
       name: "-webkit-box-direction",
       independent: true,
       inherited: true,
       initial_keyword: "normal",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["normal", "reverse"],
     },
     {
       name: "-webkit-box-flex",
       api_class: true,
       type_name: "float",
     },
     {
       name: "-webkit-box-flex-group",
       api_class: true,
@@ skipping 184 matching lines @@
       name: "-webkit-perspective-origin-y",
       api_class: "CSSPropertyAPIWebkitOriginY",
       converter: "convertLength",
       interpolable: true,
     },
     {
       name: "-webkit-print-color-adjust",
       independent: true,
       inherited: true,
       initial_keyword: "economy",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["economy", "exact"],
     },
     {
       name: "-webkit-rtl-ordering",
       independent: true,
       inherited: true,
       initial: "initialRtlOrdering",
       initial_keyword: "logical",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["logical", "visual"],
       setter: "setRtlOrdering",
       type_name: "EOrder",
     },
     {
       name: "-webkit-ruby-position",
       inherited: true,
       type_name: "RubyPosition",
     },
     {
@@ skipping 80 matching lines @@
     },
     {
       name: "user-select",
       inherited: true,
     },
     {
       name: "white-space",
       independent: true,
       inherited: true,
       initial_keyword: "normal",
-      keyword_only: true,
+      field_template: "keyword",
       keywords: ["normal", "pre", "pre-wrap", "pre-line", "nowrap", "-webkit-nowrap"],
     },
     {
       name: "widows",
       inherited: true,
       interpolable: true,
       type_name: "short",
     },
     {
       name: "width",
@@ skipping 759 matching lines @@
     {
       name: "-webkit-transition-timing-function",
       alias_for: "transition-timing-function",
     },
     {
       name: "-webkit-user-select",
       alias_for: "user-select",
     },
   ],
 }