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

Unified Diff: sky/engine/core/css/CSSComputedStyleDeclaration.cpp

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/core.gni ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698