Revert of Move nested classes in ComputedStyleBase outside.

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

 {% from 'macros.tmpl' import license, print_if %}
 {% from 'fields/field.tmpl' import encode, getter_expression, declare_storage, fieldwise_compare %}
 {% from 'fields/group.tmpl' import define_field_group_class %}
 {{license()}}
 
 #ifndef ComputedStyleBase_h
 #define ComputedStyleBase_h
 
 #include "core/style/ComputedStyleConstants.h"
 #include "core/CoreExport.h"
@@ skipping 14 matching lines @@
 {% set field_templates = {
      'keyword': keyword,
      'primitive': primitive,
      'monotonic_flag': monotonic_flag,
      'storage_only': storage_only, 
      'external': external
    } %}
 
 namespace blink {
 
-{% for subgroup in computed_style.subgroups %}
-{{define_field_group_class(subgroup)|indent(2)}}
-
-{% endfor %}
-
 // The generated portion of ComputedStyle. For more info, see the header comment
 // in ComputedStyle.h.
 class CORE_EXPORT ComputedStyleBase {
  public:
   inline bool IndependentInheritedEqual(const ComputedStyleBase& o) const {
     return (
         {{fieldwise_compare(computed_style, computed_style.all_fields
             |selectattr("is_property")
             |selectattr("is_inherited")
             |selectattr("is_independent")
@@ skipping 47 matching lines @@
 
   // Fields.
   // TODO(sashab): Remove initialFoo() static methods and update callers to
   // use resetFoo(), which can be more efficient.
 
   {% for field in computed_style.all_fields %}
   // {{field.property_name}}
   {{field_templates[field.field_template].decl_public_methods(field)|indent(2)}}
 
   {% endfor %}
+ private:
+  {% for subgroup in computed_style.subgroups %}
+  {{define_field_group_class(subgroup)|indent(2)}}
+
+  {% endfor %}
 
  protected:
   // Constructor and destructor are protected so that only the parent class ComputedStyle
   // can instantiate this class.
   ALWAYS_INLINE ComputedStyleBase() :
   {% for field in computed_style.fields %}
       {{field.name}}({{encode(field, field.default_value)}}){{print_if(not loop.last, ',')}}
   {% endfor %}
   {
     {% for subgroup in computed_style.subgroups %}
@@ skipping 18 matching lines @@
 
  private:
   {% for field in computed_style.fields %}
   {{declare_storage(field)}}
   {% endfor %}
 };
 
 } // namespace blink
 
 #endif // ComputedStyleBase_h