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

Unified Diff: sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp

Issue 892903002: Remove -webkit-mask-*. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix goofups Created 5 years, 11 months 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/css/parser/CSSPropertyParser.cpp ('k') | sky/engine/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
diff --git a/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp b/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
index 017d56860ffcd26c35e1f91b76e71b1ae26dc9f8..9f7ea7f53f227d00e9e74b22413444f9c1371f54 100644
--- a/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
+++ b/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
@@ -143,7 +143,6 @@ void setOnFillLayers(FillLayer& fillLayers, const AnimatableValue* value, StyleR
const AnimatableValue* layerValue = values[i].get();
switch (property) {
case CSSPropertyBackgroundImage:
- case CSSPropertyWebkitMaskImage:
if (layerValue->isImage()) {
fillLayer->setImage(state.styleImage(property, toAnimatableImage(layerValue)->toCSSValue()));
} else {
@@ -152,16 +151,13 @@ void setOnFillLayers(FillLayer& fillLayers, const AnimatableValue* value, StyleR
}
break;
case CSSPropertyBackgroundPositionX:
- case CSSPropertyWebkitMaskPositionX:
fillLayer->setXPosition(animatableValueToLength(layerValue, state));
break;
case CSSPropertyBackgroundPositionY:
- case CSSPropertyWebkitMaskPositionY:
fillLayer->setYPosition(animatableValueToLength(layerValue, state));
break;
case CSSPropertyBackgroundSize:
case CSSPropertyWebkitBackgroundSize:
- case CSSPropertyWebkitMaskSize:
setFillSize(fillLayer, layerValue, state);
break;
default:
@@ -173,20 +169,16 @@ void setOnFillLayers(FillLayer& fillLayers, const AnimatableValue* value, StyleR
while (fillLayer) {
switch (property) {
case CSSPropertyBackgroundImage:
- case CSSPropertyWebkitMaskImage:
fillLayer->clearImage();
break;
case CSSPropertyBackgroundPositionX:
- case CSSPropertyWebkitMaskPositionX:
fillLayer->clearXPosition();
break;
case CSSPropertyBackgroundPositionY:
- case CSSPropertyWebkitMaskPositionY:
fillLayer->clearYPosition();
break;
case CSSPropertyBackgroundSize:
case CSSPropertyWebkitBackgroundSize:
- case CSSPropertyWebkitMaskSize:
fillLayer->clearSize();
break;
default:
@@ -446,31 +438,6 @@ void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverSt
case CSSPropertyFilter:
style->setFilter(toAnimatableFilterOperations(value)->operations());
return;
- case CSSPropertyWebkitMaskBoxImageOutset:
- style->setMaskBoxImageOutset(animatableValueToBorderImageLengthBox(value, state));
- return;
- case CSSPropertyWebkitMaskBoxImageSlice:
- style->setMaskBoxImageSlices(animatableValueToLengthBox(toAnimatableLengthBoxAndBool(value)->box(), state, ValueRangeNonNegative));
- style->setMaskBoxImageSlicesFill(toAnimatableLengthBoxAndBool(value)->flag());
- return;
- case CSSPropertyWebkitMaskBoxImageSource:
- style->setMaskBoxImageSource(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
- return;
- case CSSPropertyWebkitMaskBoxImageWidth:
- style->setMaskBoxImageWidth(animatableValueToBorderImageLengthBox(value, state));
- return;
- case CSSPropertyWebkitMaskImage:
- setOnFillLayers<CSSPropertyWebkitMaskImage>(style->accessMaskLayers(), value, state);
- return;
- case CSSPropertyWebkitMaskPositionX:
- setOnFillLayers<CSSPropertyWebkitMaskPositionX>(style->accessMaskLayers(), value, state);
- return;
- case CSSPropertyWebkitMaskPositionY:
- setOnFillLayers<CSSPropertyWebkitMaskPositionY>(style->accessMaskLayers(), value, state);
- return;
- case CSSPropertyWebkitMaskSize:
- setOnFillLayers<CSSPropertyWebkitMaskSize>(style->accessMaskLayers(), value, state);
- return;
case CSSPropertyPerspective:
style->setPerspective(clampTo<float>(toAnimatableDouble(value)->toDouble()));
return;
« no previous file with comments | « sky/engine/core/css/parser/CSSPropertyParser.cpp ('k') | sky/engine/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698