Index: Source/core/css/parser/CSSPropertyParser.cpp |
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp |
index d789b39fb7d88ef9f3672af8bb08475ea64cb903..33a8ee326883ec26da4a37db9bbe0a8b87fe8d1f 100644 |
--- a/Source/core/css/parser/CSSPropertyParser.cpp |
+++ b/Source/core/css/parser/CSSPropertyParser.cpp |
@@ -727,16 +727,19 @@ bool CSSPropertyParser::parseValue(CSSPropertyID propId, bool important) |
CSSPropertyID propId1, propId2; |
bool result = false; |
if (parseFillProperty(propId, propId1, propId2, val1, val2)) { |
- OwnPtr<ShorthandScope> shorthandScope; |
if (propId == CSSPropertyBackgroundPosition || |
propId == CSSPropertyBackgroundRepeat || |
propId == CSSPropertyWebkitMaskPosition || |
propId == CSSPropertyWebkitMaskRepeat) { |
- shorthandScope = adoptPtr(new ShorthandScope(this, propId)); |
+ ShorthandScope scope(this, propId); |
+ addProperty(propId1, val1.release(), important); |
+ if (val2) |
+ addProperty(propId2, val2.release(), important); |
+ } else { |
+ addProperty(propId1, val1.release(), important); |
+ if (val2) |
+ addProperty(propId2, val2.release(), important); |
} |
- addProperty(propId1, val1.release(), important); |
- if (val2) |
- addProperty(propId2, val2.release(), important); |
result = true; |
} |
m_implicitShorthand = false; |