Clean up type handling in make_computed_style_base.py.

third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.h.tmpl

 {% from 'macros.tmpl' import license, print_if %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/ComputedStyleBaseConstants.h"
 #include "core/CoreExport.h"
-{% for field in fields if field.storage_type_path != None %}
-#include "{{field.storage_type_path}}.h"
+{% for field in fields if field.field_type_path != None %}
+#include "{{field.field_type_path}}.h"
 {% endfor %}
 
 {# Returns the default value for the field, converted to fit in the storage container. #}
 {% macro default_value(field) -%}
 {# We only support enum fields for now. #}
 static_cast<unsigned>({{field.default_value}})
 {%- endmacro %}
 
 namespace blink {
 
@@ skipping 72 matching lines @@
   void copyNonInheritedFromCached(const ComputedStyleBase& other);
 
   // Copies the values of any independent inherited properties from the parent
   // style that are marked as inherited by this style.
   void propagateIndependentInheritedProperties(
       const ComputedStyleBase& parentStyle);
 
   // Fields.
   // TODO(sashab): Remove initialFoo() static methods and update callers to
   // use resetFoo(), which can be more efficient.
+
   {% for field in fields %}
   // {{field.property_name}}
-  inline static {{field.storage_type}} {{field.initial_method_name}}() { return {{field.default_value}}; }
-  {{field.storage_type}} {{field.getter_method_name}}() const { return static_cast<{{field.storage_type}}>({{field.name}}); }
+  inline static {{field.type_name}} {{field.initial_method_name}}() {
+    return {{field.default_value}};
+  }
+  {{field.type_name}} {{field.getter_method_name}}() const {
+    return static_cast<{{field.type_name}}>({{field.name}});
+  }
   {% if field.is_nonproperty %}
-  void {{field.setter_method_name}}() { {{field.name}} = static_cast<unsigned>(true); }
+  void {{field.setter_method_name}}() {
+    {{field.name}} = static_cast<unsigned>(true);
+  }
   {% else %}
-  void {{field.setter_method_name}}({{field.storage_type}} v) { {{field.name}} = static_cast<unsigned>(v); }
+  void {{field.setter_method_name}}({{field.type_name}} v) {
+    {{field.name}} = static_cast<unsigned>(v);
+  }
   {% endif %}
-  inline void {{field.resetter_method_name}}() { {{field.name}} = {{default_value(field)}}; }
+  inline void {{field.resetter_method_name}}() {
+    {{field.name}} = {{default_value(field)}};
+  }
 
   {% endfor %}
  protected:
   // Storage.
   {% for field in fields %}
-  unsigned {{field.name}} : {{field.size}}; // {{field.storage_type}}
+  unsigned {{field.name}} : {{field.size}}; // {{field.type_name}}
   {% endfor %}
 };
 
 } // namespace blink
 
 #endif // ComputedStyleBase_h