Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(228)

Unified Diff: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

Issue 340703004: Check before setting initial border image styles (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reorder for readability Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
diff --git a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
index 25853f8c9e4e99feba4c022882a5823e29ecd179..339c7ca6a2a8f8960fbf3d26761b8b343c676d23 100644
--- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
+++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
@@ -156,27 +156,75 @@ namespace WebCore {
{{apply_auto('CSSPropertyWidows')}}
{{apply_auto('CSSPropertyZIndex')}}
+static bool lengthTypeAndValueMatch(const Length& length, LengthType type, float value)
+{
+ return length.type() == type && length.value() == value;
+}
+
+static bool lengthTypeAndValueMatch(const LengthBox& lengthBox, LengthType type, float value)
+{
+ 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));
+}
+
{% 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) }}
{
- NinePieceImage image(state.style()->{{getter}}());
+ 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))
+ 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))
+ return;
+ {% elif modifier_type == 'Slice' and not is_mask_box %}
+ if (currentImage.fill() == false && lengthTypeAndValueMatch(currentImage.imageSlices(), Percent, 100))
+ 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))
+ return;
+ {% elif modifier_type == 'Width' and not is_mask_box %}
+ if (lengthTypeAndValueMatch(currentImage.borderSlices(), Fixed, 1))
+ 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 %}
- // Masks have a different initial value for slices. Preserve the value of 0 for backwards compatibility.
image.setImageSlices(LengthBox({{ (['Length(0, Fixed)']*4) | join(', ') }}));
image.setFill(true);
{% elif modifier_type == 'Slice' and not is_mask_box %}
image.setImageSlices(LengthBox({{ (['Length(100, Percent)']*4) | join(', ') }}));
image.setFill(false);
{% elif modifier_type == 'Width' %}
- // Masks have a different initial value for widths. Preserve the value of 'auto' for backwards compatibility.
image.setBorderSlices({{ 'Length(Auto)' if is_mask_box else '1.0' }});
{% endif %}
state.style()->{{setter}}(image);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698