| Index: trunk/Source/core/css/CSSParser-in.cpp
|
| ===================================================================
|
| --- trunk/Source/core/css/CSSParser-in.cpp (revision 157750)
|
| +++ trunk/Source/core/css/CSSParser-in.cpp (working copy)
|
| @@ -145,9 +145,9 @@
|
| return false;
|
| }
|
|
|
| -static PassRefPtr<CSSPrimitiveValue> createPrimitiveValuePair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second, Pair::IdenticalValuesPolicy identicalValuesPolicy = Pair::DropIdenticalValues)
|
| +static PassRefPtr<CSSPrimitiveValue> createPrimitiveValuePair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second)
|
| {
|
| - return cssValuePool().createValue(Pair::create(first, second, identicalValuesPolicy));
|
| + return cssValuePool().createValue(Pair::create(first, second));
|
| }
|
|
|
| class AnimationParseContext {
|
| @@ -1990,8 +1990,6 @@
|
| m_implicitShorthand = false;
|
| return result;
|
| }
|
| - case CSSPropertyObjectPosition:
|
| - return RuntimeEnabledFeatures::objectFitPositionEnabled() && parseObjectPosition(important);
|
| case CSSPropertyListStyleImage: // <uri> | none | inherit
|
| case CSSPropertyBorderImageSource:
|
| case CSSPropertyWebkitMaskBoxImageSource:
|
| @@ -6618,20 +6616,6 @@
|
| return true;
|
| }
|
|
|
| -bool CSSParser::parseObjectPosition(bool important)
|
| -{
|
| - RefPtr<CSSValue> xValue;
|
| - RefPtr<CSSValue> yValue;
|
| - parseFillPosition(m_valueList.get(), xValue, yValue);
|
| - if (!xValue || !yValue)
|
| - return false;
|
| - addProperty(
|
| - CSSPropertyObjectPosition,
|
| - createPrimitiveValuePair(toCSSPrimitiveValue(xValue.get()), toCSSPrimitiveValue(yValue.get()), Pair::KeepIdenticalValues),
|
| - important);
|
| - return true;
|
| -}
|
| -
|
| struct BorderImageParseContext {
|
| BorderImageParseContext()
|
| : m_canAdvance(false)
|
|
|