ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

 {% from 'macros.tmpl' import license %}
 {#
     This file is for property handlers which use the templating engine to
     reduce (handwritten) code duplication.
 
     The `properties' dict can be used to access a property's parameters in
     jinja2 templates (i.e. setter, getter, initial, type_name)
 #}
 #include "StyleBuilderFunctions.h"
 
@@ skipping 167 matching lines @@
 
 {% macro apply_border_image_modifier(property_id, modifier_type) %}
 {% set is_mask_box = 'MaskBox' in property_id %}
 {% set getter = 'maskBoxImage' if is_mask_box else 'borderImage' %}
 {% set setter = 'setMaskBoxImage' if is_mask_box else 'setBorderImage' %}
 {{ declare_initial_function(property_id) }} {
   const NinePieceImage& currentImage = state.style()->{{getter}}();
   {# Check for equality in case we can bail out before creating a new NinePieceImage. #}
   {% if modifier_type == 'Outset' %}
   if (borderImageLengthMatchesAllSides(currentImage.outset(),
-                                       BorderImageLength(Length(0, Fixed))))
+                                       BorderImageLength(Length(0, kFixed))))
     return;
   {% elif modifier_type == 'Repeat' %}
-  if (currentImage.horizontalRule() == StretchImageRule &&
-      currentImage.verticalRule() == StretchImageRule)
+  if (currentImage.horizontalRule() == kStretchImageRule &&
+      currentImage.verticalRule() == kStretchImageRule)
     return;
   {% elif modifier_type == 'Slice' and is_mask_box %}
   // Masks have a different initial value for slices. Preserve the value of 0
   // for backwards compatibility.
   if (currentImage.fill() == true &&
-      lengthMatchesAllSides(currentImage.imageSlices(), Length(0, Fixed)))
+      lengthMatchesAllSides(currentImage.imageSlices(), Length(0, kFixed)))
     return;
   {% elif modifier_type == 'Slice' and not is_mask_box %}
   if (currentImage.fill() == false &&
-      lengthMatchesAllSides(currentImage.imageSlices(), Length(100, Percent)))
+      lengthMatchesAllSides(currentImage.imageSlices(), Length(100, kPercent)))
     return;
   {% elif modifier_type == 'Width' and is_mask_box %}
   // Masks have a different initial value for widths. Preserve the value of
   // 'auto' for backwards compatibility.
   if (borderImageLengthMatchesAllSides(currentImage.borderSlices(),
-                                       BorderImageLength(Length(Auto))))
+                                       BorderImageLength(Length(kAuto))))
     return;
   {% elif modifier_type == 'Width' and not is_mask_box %}
   if (borderImageLengthMatchesAllSides(currentImage.borderSlices(),
                                        BorderImageLength(1.0)))
     return;
   {% endif %}
 
   NinePieceImage image(currentImage);
   {% if modifier_type == 'Outset' %}
-  image.setOutset(Length(0, Fixed));
+  image.setOutset(Length(0, kFixed));
   {% elif modifier_type == 'Repeat' %}
-  image.setHorizontalRule(StretchImageRule);
-  image.setVerticalRule(StretchImageRule);
+  image.setHorizontalRule(kStretchImageRule);
+  image.setVerticalRule(kStretchImageRule);
   {% elif modifier_type == 'Slice' and is_mask_box %}
-  image.setImageSlices(LengthBox({{ (['Length(0, Fixed)']*4) | join(', ') }}));
+  image.setImageSlices(LengthBox({{ (['Length(0, kFixed)']*4) | join(', ') }}));
   image.setFill(true);
   {% elif modifier_type == 'Slice' and not is_mask_box %}
-  image.setImageSlices(LengthBox({{ (['Length(100, Percent)']*4) | join(', ') }}));
+  image.setImageSlices(LengthBox({{ (['Length(100, kPercent)']*4) | join(', ') }}));
   image.setFill(false);
   {% elif modifier_type == 'Width' %}
-  image.setBorderSlices({{ 'Length(Auto)' if is_mask_box else '1.0' }});
+  image.setBorderSlices({{ 'Length(kAuto)' if is_mask_box else '1.0' }});
   {% endif %}
   state.style()->{{setter}}(image);
 }
 
 {{declare_inherit_function(property_id)}} {
   NinePieceImage image(state.style()->{{getter}}());
   {% if modifier_type == 'Outset' %}
   image.copyOutsetFrom(state.parentStyle()->{{getter}}());
   {% elif modifier_type == 'Repeat' %}
   image.copyRepeatFrom(state.parentStyle()->{{getter}}());
@@ skipping 90 matching lines @@
   const CounterDirectiveMap* parentMap = state.parentStyle()->counterDirectives();
   if (!parentMap)
     return;
 
   CounterDirectiveMap& map = state.style()->accessCounterDirectives();
   DCHECK(!parentMap->isEmpty());
 
   typedef CounterDirectiveMap::const_iterator Iterator;
   Iterator end = parentMap->end();
   for (Iterator it = parentMap->begin(); it != end; ++it) {
-    CounterDirectives& directives = map.add(it->key, CounterDirectives()).storedValue->value;
+    CounterDirectives& directives = map.add(it->key, CounterDirectives()).stored_value->value;
     directives.inherit{{action}}(it->value);
   }
 }
 
 {{declare_value_function(property_id)}} {
   state.style()->clear{{action}}Directives();
 
   if (!value.isValueList()) {
     DCHECK(value.isIdentifierValue());
     DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), CSSValueNone);
     return;
   }
 
   CounterDirectiveMap& map = state.style()->accessCounterDirectives();
 
   const CSSValueList& list = toCSSValueList(value);
 
   for (size_t i = 0; i < list.length(); ++i) {
     const CSSValuePair& pair = toCSSValuePair(list.item(i));
     AtomicString identifier(toCSSCustomIdentValue(pair.first()).value());
     int value = toCSSPrimitiveValue(pair.second()).getIntValue();
     CounterDirectives& directives =
-        map.add(identifier, CounterDirectives()).storedValue->value;
+        map.add(identifier, CounterDirectives()).stored_value->value;
     {% if action == 'Reset' %}
     directives.setResetValue(value);
     {% else %}
     directives.addIncrementValue(value);
     {% endif %}
   }
   DCHECK(!map.isEmpty());
 }
 {% endmacro %}
 {{apply_counter('CSSPropertyCounterIncrement', 'Increment')}}
 {{apply_counter('CSSPropertyCounterReset', 'Reset')}}
 
 {% macro apply_fill_layer(property_id, fill_type) %}
 {% set layer_type = 'Background' if 'Background' in property_id else 'Mask' %}
-{% set fill_layer_type = layer_type + 'FillLayer' %}
+{% set fill_layer_type = 'k' + layer_type + 'FillLayer' %}
 {% set access_layers = 'access' + layer_type + 'Layers' %}
 {% set map_fill = 'mapFill' + fill_type %}
 {{declare_initial_function(property_id)}} {
   FillLayer* currChild = &state.style()->{{access_layers}}();
   currChild->set{{fill_type}}(FillLayer::initialFill{{fill_type}}({{fill_layer_type}}));
   for (currChild = currChild->next(); currChild; currChild = currChild->next())
     currChild->clear{{fill_type}}();
 }
 
 {{declare_inherit_function(property_id)}} {
@@ skipping 85 matching lines @@
   size_t autoRepeatInsertionPoint =
       ComputedStyle::initialGridAutoRepeatInsertionPoint();
   StyleBuilderConverter::convertGridTrackList(
       value, trackSizes, namedGridLines, orderedNamedGridLines,
       autoRepeatTrackSizes, autoRepeatNamedGridLines,
       autoRepeatOrderedNamedGridLines, autoRepeatInsertionPoint,
       autoRepeatType, state);
   const NamedGridAreaMap& namedGridAreas = state.style()->namedGridArea();
   if (!namedGridAreas.isEmpty()) {
     StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(
-        namedGridAreas, namedGridLines, For{{type}}s);
+        namedGridAreas, namedGridLines, kFor{{type}}s);
   }
   state.style()->setGridTemplate{{type}}s(trackSizes);
   state.style()->setNamedGrid{{type}}Lines(namedGridLines);
   state.style()->setOrderedNamedGrid{{type}}Lines(orderedNamedGridLines);
   state.style()->setGridAutoRepeat{{type}}s(autoRepeatTrackSizes);
   state.style()->setGridAutoRepeat{{type}}sInsertionPoint(
       autoRepeatInsertionPoint);
   state.style()->setAutoRepeatNamedGrid{{type}}Lines(autoRepeatNamedGridLines);
   state.style()->setAutoRepeatOrderedNamedGrid{{type}}Lines(
       autoRepeatOrderedNamedGridLines);
@@ skipping 53 matching lines @@
                               : SVG_PAINTTYPE_URI_RGBCOLOR;
   }
   {{set_value(property)}}(paintType, color, url,
       state.applyPropertyToRegularStyle(),
       state.applyPropertyToVisitedLinkStyle());
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace blink