Fast path when setting border-image-width to initial always fails

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 "config.h"
 #include "StyleBuilderFunctions.h"
@@ skipping 139 matching lines @@
 }
 {% endmacro %}
 {{apply_auto('CSSPropertyClip')}}
 {{apply_auto('CSSPropertyOrphans')}}
 {{apply_auto('CSSPropertyWebkitColumnCount')}}
 {{apply_auto('CSSPropertyWebkitColumnGap', auto_getter='hasNormalColumnGap', auto_setter='setHasNormalColumnGap', auto_identity='CSSValueNormal')}}
 {{apply_auto('CSSPropertyWebkitColumnWidth')}}
 {{apply_auto('CSSPropertyWidows')}}
 {{apply_auto('CSSPropertyZIndex')}}
 
-static bool lengthTypeAndValueMatch(const Length& length, LengthType type, float value)
+static bool lengthTypeAndValueMatch(const LengthBox& lengthBox, const Length& length)

[Timothy Loh, 2015/06/03 05:27:44]

rename to lengthMatchesAllSides?

[Sunil Ratnu, 2015/06/03 05:42:25]

Seems more appropriate. Done.

 {
-    return length.type() == type && length.value() == value;
+    return (lengthBox.left() == length
+        && lengthBox.right() == length
+        && lengthBox.top() == length
+        && lengthBox.bottom() == length);
 }
 
-static bool lengthTypeAndValueMatch(const LengthBox& lengthBox, LengthType type, float value)
+static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengthBox, const BorderImageLength& borderImageLength)

[Timothy Loh, 2015/06/03 05:27:44]

rename to borderImageLengthMatchesAllSides?

[Sunil Ratnu, 2015/06/03 05:42:26]

Seems more appropriate. Done.

 {
-    return (lengthTypeAndValueMatch(lengthBox.left(), type, value)
-        && lengthTypeAndValueMatch(lengthBox.right(), type, value)
-        && lengthTypeAndValueMatch(lengthBox.top(), type, value)
-        && lengthTypeAndValueMatch(lengthBox.bottom(), type, value));
-}
-
-static bool lengthTypeAndValueMatch(const BorderImageLength& borderImageLength, LengthType type, float value)
-{
-    return borderImageLength.isLength() && lengthTypeAndValueMatch(borderImageLength.length(), type, value);
-}
-
-static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengthBox, LengthType type, float value)
-{
-    return (lengthTypeAndValueMatch(borderImageLengthBox.left(), type, value)
-        && lengthTypeAndValueMatch(borderImageLengthBox.right(), type, value)
-        && lengthTypeAndValueMatch(borderImageLengthBox.top(), type, value)
-        && lengthTypeAndValueMatch(borderImageLengthBox.bottom(), type, value));
+    return (borderImageLengthBox.left() == borderImageLength
+        && borderImageLengthBox.right() == borderImageLength
+        && borderImageLengthBox.top() == borderImageLength
+        && borderImageLengthBox.bottom() == borderImageLength);
 }
 
 {% 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 (lengthTypeAndValueMatch(currentImage.outset(), Fixed, 0))
+    if (lengthTypeAndValueMatch(currentImage.outset(), BorderImageLength(Length(0, Fixed))))
         return;
     {% elif modifier_type == 'Repeat' %}
     if (currentImage.horizontalRule() == StretchImageRule && currentImage.verticalRule() == StretchImageRule)
         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 && lengthTypeAndValueMatch(currentImage.imageSlices(), Fixed, 0))
+    if (currentImage.fill() == true && lengthTypeAndValueMatch(currentImage.imageSlices(), Length(0, Fixed)))
         return;
     {% elif modifier_type == 'Slice' and not is_mask_box %}
-    if (currentImage.fill() == false && lengthTypeAndValueMatch(currentImage.imageSlices(), Percent, 100))
+    if (currentImage.fill() == false && lengthTypeAndValueMatch(currentImage.imageSlices(), Length(100, Percent)))
         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 (lengthTypeAndValueMatch(currentImage.borderSlices(), Auto, 0))
+    if (lengthTypeAndValueMatch(currentImage.borderSlices(), BorderImageLength(Length(Auto))))
         return;
     {% elif modifier_type == 'Width' and not is_mask_box %}
-    if (lengthTypeAndValueMatch(currentImage.borderSlices(), Fixed, 1))
+    if (lengthTypeAndValueMatch(currentImage.borderSlices(), BorderImageLength(1.0)))
         return;
     {% endif %}
 
     NinePieceImage image(currentImage);
     {% if modifier_type == 'Outset' %}
     image.setOutset(Length(0, Fixed));
     {% elif modifier_type == 'Repeat' %}
     image.setHorizontalRule(StretchImageRule);
     image.setVerticalRule(StretchImageRule);
     {% elif modifier_type == 'Slice' and is_mask_box %}
@@ skipping 334 matching lines @@
         }
         {{set_value(property)}}(ptype, c, url,
             state.applyPropertyToRegularStyle(),
             state.applyPropertyToVisitedLinkStyle());
     }
 }
 {% endmacro %}
 {{apply_svg_paint('CSSPropertyFill', 'FillPaint')}}
 {{apply_svg_paint('CSSPropertyStroke', 'StrokePaint')}}
 } // namespace blink