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

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

Index: third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
diff --git a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
index 2b202188490d5e323b72e42a3e29bdbe3214776d..25b8801da51a170ea97d915f36e217f06341f0bd 100644
--- a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
@@ -185,27 +185,27 @@ static bool borderImageLengthMatchesAllSides(
   {# 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(),
@@ -215,18 +215,18 @@ static bool borderImageLengthMatchesAllSides(
 
   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);
 }
@@ -337,7 +337,7 @@ static bool borderImageLengthMatchesAllSides(
   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);
   }
 }
@@ -360,7 +360,7 @@ static bool borderImageLengthMatchesAllSides(
     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 %}
@@ -375,7 +375,7 @@ static bool borderImageLengthMatchesAllSides(
 
 {% 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)}} {
@@ -481,7 +481,7 @@ static bool borderImageLengthMatchesAllSides(
   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);