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

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

Issue 1214633005: Remove CSS clients of ImageResource (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 57acfbb9f5f89e73fcc99c995289dd3cc51fa8b8..bf7edb91448e0dd4d663488b3c91ac695bc99698 100644
--- a/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
+++ b/sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp
@@ -34,7 +34,6 @@
#include "sky/engine/core/animation/animatable/AnimatableColor.h"
#include "sky/engine/core/animation/animatable/AnimatableDouble.h"
#include "sky/engine/core/animation/animatable/AnimatableFilterOperations.h"
-#include "sky/engine/core/animation/animatable/AnimatableImage.h"
#include "sky/engine/core/animation/animatable/AnimatableLength.h"
#include "sky/engine/core/animation/animatable/AnimatableLengthBox.h"
#include "sky/engine/core/animation/animatable/AnimatableLengthBoxAndBool.h"
@@ -142,12 +141,7 @@ void setOnFillLayers(FillLayer& fillLayers, const AnimatableValue* value, StyleR
const AnimatableValue* layerValue = values[i].get();
switch (property) {
case CSSPropertyBackgroundImage:
- if (layerValue->isImage()) {
- fillLayer->setImage(state.styleImage(property, toAnimatableImage(layerValue)->toCSSValue()));
- } else {
- ASSERT(toAnimatableUnknown(layerValue)->toCSSValueID() == CSSValueNone);
- fillLayer->setImage(nullptr);
- }
+ fillLayer->setImage(nullptr);
break;
case CSSPropertyBackgroundPositionX:
fillLayer->setXPosition(animatableValueToLength(layerValue, state));
@@ -274,7 +268,6 @@ void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverSt
style->setBorderImageSlices(animatableValueToLengthBox(value, state, ValueRangeNonNegative));
return;
case CSSPropertyBorderImageSource:
- style->setBorderImageSource(state.styleImage(property, toAnimatableImage(value)->toCSSValue()));
return;
case CSSPropertyBorderImageWidth:
style->setBorderImageWidth(animatableValueToBorderImageLengthBox(value, state));
« 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