diff options
Diffstat (limited to 'Source/WebCore/css/StylePropertySet.cpp')
| -rw-r--r-- | Source/WebCore/css/StylePropertySet.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebCore/css/StylePropertySet.cpp b/Source/WebCore/css/StylePropertySet.cpp index a5c8806ba..caeda8896 100644 --- a/Source/WebCore/css/StylePropertySet.cpp +++ b/Source/WebCore/css/StylePropertySet.cpp @@ -23,6 +23,7 @@ #include "StylePropertySet.h" #include "CSSParser.h" +#include "CSSStyleSheet.h" #include "CSSValueKeywords.h" #include "CSSValueList.h" #include "CSSValuePool.h" @@ -308,6 +309,7 @@ String StylePropertySet::getLayeredShorthandValue(const StylePropertyShorthand& bool useRepeatXShorthand = false; bool useRepeatYShorthand = false; bool useSingleWordShorthand = false; + bool foundBackgroundPositionYCSSProperty = false; for (unsigned j = 0; j < size; j++) { RefPtr<CSSValue> value; if (values[j]) { @@ -359,6 +361,11 @@ String StylePropertySet::getLayeredShorthandValue(const StylePropertyShorthand& if (value && !value->isImplicitInitialValue()) { if (!layerRes.isNull()) layerRes += " "; + if (foundBackgroundPositionYCSSProperty && shorthand.properties()[j] == CSSPropertyBackgroundSize) + layerRes += "/ "; + if (!foundBackgroundPositionYCSSProperty && shorthand.properties()[j] == CSSPropertyBackgroundSize) + continue; + if (useRepeatXShorthand) { useRepeatXShorthand = false; layerRes += getValueName(CSSValueRepeatX); @@ -370,6 +377,9 @@ String StylePropertySet::getLayeredShorthandValue(const StylePropertyShorthand& layerRes += value->cssText(); } else layerRes += value->cssText(); + + if (shorthand.properties()[j] == CSSPropertyBackgroundPositionY) + foundBackgroundPositionYCSSProperty = true; } } |