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

Unified Diff: Source/core/animation/ImageSliceStyleInterpolation.cpp

Issue 1225553002: CSSValue Immediates: Make CSSPrimitiveValue a container (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_1
Patch Set: Rebase 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
Index: Source/core/animation/ImageSliceStyleInterpolation.cpp
diff --git a/Source/core/animation/ImageSliceStyleInterpolation.cpp b/Source/core/animation/ImageSliceStyleInterpolation.cpp
index 765957bf03b7395fa42efc041d030c6a7bd54d1a..4e82d4dbd6cbacc42e424650b058781b828e98a5 100644
--- a/Source/core/animation/ImageSliceStyleInterpolation.cpp
+++ b/Source/core/animation/ImageSliceStyleInterpolation.cpp
@@ -18,7 +18,7 @@ bool ImageSliceStyleInterpolation::usesDefaultInterpolation(const CSSValue& star
return true;
const CSSBorderImageSliceValue& startSlice = toCSSBorderImageSliceValue(start);
const CSSBorderImageSliceValue& endSlice = toCSSBorderImageSliceValue(end);
- return startSlice.slices()->top()->isPercentage() != endSlice.slices()->top()->isPercentage()
+ return startSlice.slices()->top().isPercentage() != endSlice.slices()->top().isPercentage()
|| startSlice.m_fill != endSlice.m_fill;
}
@@ -41,14 +41,14 @@ private:
const size_t kQuadSides = 4;
OwnPtrWillBeRawPtr<InterpolableList> interpolableList = InterpolableList::create(kQuadSides);
const Quad& quad = *value.slices();
- interpolableList->set(0, InterpolableNumber::create(quad.top()->getDoubleValue()));
- interpolableList->set(1, InterpolableNumber::create(quad.right()->getDoubleValue()));
- interpolableList->set(2, InterpolableNumber::create(quad.bottom()->getDoubleValue()));
- interpolableList->set(3, InterpolableNumber::create(quad.left()->getDoubleValue()));
- bool isPercentage = quad.top()->isPercentage();
- ASSERT(quad.bottom()->isPercentage() == isPercentage
- && quad.left()->isPercentage() == isPercentage
- && quad.right()->isPercentage() == isPercentage);
+ interpolableList->set(0, InterpolableNumber::create(quad.top().getDoubleValue()));
+ interpolableList->set(1, InterpolableNumber::create(quad.right().getDoubleValue()));
+ interpolableList->set(2, InterpolableNumber::create(quad.bottom().getDoubleValue()));
+ interpolableList->set(3, InterpolableNumber::create(quad.left().getDoubleValue()));
+ bool isPercentage = quad.top().isPercentage();
+ ASSERT(quad.bottom().isPercentage() == isPercentage
+ && quad.left().isPercentage() == isPercentage
+ && quad.right().isPercentage() == isPercentage);
interpolableValue = interpolableList.release();
metadata = ImageSliceStyleInterpolation::Metadata {isPercentage, value.m_fill};
« no previous file with comments | « Source/core/animation/DoubleStyleInterpolationTest.cpp ('k') | Source/core/animation/KeyframeEffectModelTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698