| Index: sky/engine/core/css/CSSComputedStyleDeclaration.cpp
|
| diff --git a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
|
| index fa00567d2513b1d661d6fd48c27622208b73af4f..2a357c1d8a031577ff788c91e8990b694a393780 100644
|
| --- a/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
|
| +++ b/sky/engine/core/css/CSSComputedStyleDeclaration.cpp
|
| @@ -259,9 +259,6 @@ static const CSSPropertyID staticComputableProperties[] = {
|
| CSSPropertyWebkitPerspectiveOrigin,
|
| CSSPropertyWebkitPrintColorAdjust,
|
| CSSPropertyWebkitRtlOrdering,
|
| - CSSPropertyShapeOutside,
|
| - CSSPropertyShapeImageThreshold,
|
| - CSSPropertyShapeMargin,
|
| CSSPropertyWebkitTapHighlightColor,
|
| CSSPropertyWebkitTextDecorationsInEffect,
|
| CSSPropertyWebkitTextEmphasisColor,
|
| @@ -1202,27 +1199,6 @@ static PassRefPtr<CSSPrimitiveValue> valueForFontWeight(RenderStyle& style)
|
| return cssValuePool().createValue(style.fontDescription().weight());
|
| }
|
|
|
| -static PassRefPtr<CSSValue> valueForShape(const RenderStyle& style, ShapeValue* shapeValue)
|
| -{
|
| - if (!shapeValue)
|
| - return cssValuePool().createIdentifierValue(CSSValueNone);
|
| - if (shapeValue->type() == ShapeValue::Box)
|
| - return cssValuePool().createValue(shapeValue->cssBox());
|
| - if (shapeValue->type() == ShapeValue::Image) {
|
| - if (shapeValue->image())
|
| - return shapeValue->image()->cssValue();
|
| - return cssValuePool().createIdentifierValue(CSSValueNone);
|
| - }
|
| -
|
| - ASSERT(shapeValue->type() == ShapeValue::Shape);
|
| -
|
| - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| - list->append(valueForBasicShape(style, shapeValue->shape()));
|
| - if (shapeValue->cssBox() != BoxMissing)
|
| - list->append(cssValuePool().createValue(shapeValue->cssBox()));
|
| - return list.release();
|
| -}
|
| -
|
| static PassRefPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction touchAction)
|
| {
|
| RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| @@ -2217,12 +2193,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
|
| return valueForBasicShape(*style, toShapeClipPathOperation(operation)->basicShape());
|
| }
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| - case CSSPropertyShapeMargin:
|
| - return cssValuePool().createValue(style->shapeMargin(), *style);
|
| - case CSSPropertyShapeImageThreshold:
|
| - return cssValuePool().createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER);
|
| - case CSSPropertyShapeOutside:
|
| - return valueForShape(*style, style->shapeOutside());
|
| case CSSPropertyWebkitFilter:
|
| return valueForFilter(renderer, *style);
|
| case CSSPropertyMixBlendMode:
|
|
|