| Index: third_party/WebKit/Source/core/animation/LengthInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/LengthInterpolationType.cpp b/third_party/WebKit/Source/core/animation/LengthInterpolationType.cpp
|
| deleted file mode 100644
|
| index 43a51c64f4a40f09d2686a537bd5f8be6dc5d7e2..0000000000000000000000000000000000000000
|
| --- a/third_party/WebKit/Source/core/animation/LengthInterpolationType.cpp
|
| +++ /dev/null
|
| @@ -1,317 +0,0 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "config.h"
|
| -#include "core/animation/LengthInterpolationType.h"
|
| -
|
| -#include "core/animation/LengthPropertyFunctions.h"
|
| -#include "core/animation/css/CSSAnimatableValueFactory.h"
|
| -#include "core/css/CSSCalculationValue.h"
|
| -#include "core/css/resolver/StyleBuilder.h"
|
| -#include "core/css/resolver/StyleResolverState.h"
|
| -
|
| -namespace blink {
|
| -
|
| -// This class is implemented as a singleton whose instance represents the presence of percentages being used in a Length value
|
| -// while nullptr represents the absence of any percentages.
|
| -class LengthNonInterpolableValue : public NonInterpolableValue {
|
| -public:
|
| - ~LengthNonInterpolableValue() final { ASSERT_NOT_REACHED(); }
|
| - static PassRefPtr<LengthNonInterpolableValue> create(bool hasPercentage)
|
| - {
|
| - DEFINE_STATIC_REF(LengthNonInterpolableValue, singleton, adoptRef(new LengthNonInterpolableValue()));
|
| - ASSERT(singleton);
|
| - return hasPercentage ? singleton : nullptr;
|
| - }
|
| - static PassRefPtr<LengthNonInterpolableValue> merge(const NonInterpolableValue* a, const NonInterpolableValue* b)
|
| - {
|
| - return create(hasPercentage(a) || hasPercentage(b));
|
| - }
|
| - static bool hasPercentage(const NonInterpolableValue* nonInterpolableValue)
|
| - {
|
| - ASSERT(!nonInterpolableValue || nonInterpolableValue->type() == LengthNonInterpolableValue::staticType);
|
| - return static_cast<bool>(nonInterpolableValue);
|
| - }
|
| -
|
| - DECLARE_NON_INTERPOLABLE_VALUE_TYPE();
|
| -
|
| -private:
|
| - LengthNonInterpolableValue() { }
|
| -};
|
| -
|
| -DEFINE_NON_INTERPOLABLE_VALUE_TYPE(LengthNonInterpolableValue);
|
| -DEFINE_NON_INTERPOLABLE_VALUE_TYPE_CASTS(LengthNonInterpolableValue);
|
| -
|
| -LengthInterpolationType::LengthInterpolationType(CSSPropertyID property)
|
| - : CSSInterpolationType(property)
|
| - , m_valueRange(LengthPropertyFunctions::valueRange(property))
|
| -{ }
|
| -
|
| -static PassOwnPtr<InterpolableList> createNeutralInterpolableValue()
|
| -{
|
| - const size_t length = CSSPrimitiveValue::LengthUnitTypeCount;
|
| - OwnPtr<InterpolableList> values = InterpolableList::create(length);
|
| - for (size_t i = 0; i < length; i++)
|
| - values->set(i, InterpolableNumber::create(0));
|
| - return values.release();
|
| -}
|
| -
|
| -float LengthInterpolationType::effectiveZoom(const ComputedStyle& style) const
|
| -{
|
| - return LengthPropertyFunctions::isZoomedLength(cssProperty()) ? style.effectiveZoom() : 1;
|
| -}
|
| -
|
| -PassOwnPtr<InterpolableValue> LengthInterpolationType::createInterpolablePixels(double pixels)
|
| -{
|
| - OwnPtr<InterpolableList> interpolableList = createNeutralInterpolableValue();
|
| - interpolableList->set(CSSPrimitiveValue::UnitTypePixels, InterpolableNumber::create(pixels));
|
| - return interpolableList.release();
|
| -}
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertLength(const Length& length, float zoom) const
|
| -{
|
| - if (!length.isSpecified())
|
| - return nullptr;
|
| -
|
| - PixelsAndPercent pixelsAndPercent = length.pixelsAndPercent();
|
| - OwnPtr<InterpolableList> values = createNeutralInterpolableValue();
|
| - values->set(CSSPrimitiveValue::UnitTypePixels, InterpolableNumber::create(pixelsAndPercent.pixels / zoom));
|
| - values->set(CSSPrimitiveValue::UnitTypePercentage, InterpolableNumber::create(pixelsAndPercent.percent));
|
| -
|
| - return InterpolationValue::create(*this, values.release(), LengthNonInterpolableValue::create(length.hasPercent()));
|
| -}
|
| -
|
| -InterpolationComponent LengthInterpolationType::maybeConvertCSSValue(const CSSValue& value)
|
| -{
|
| - if (!value.isPrimitiveValue())
|
| - return nullptr;
|
| -
|
| - const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
|
| -
|
| - CSSLengthArray valueArray;
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++)
|
| - valueArray.append(0);
|
| - bool hasPercentage = false;
|
| -
|
| - if (!primitiveValue.isLength() && !primitiveValue.isPercentage() && !primitiveValue.isCalculatedPercentageWithLength())
|
| - return nullptr;
|
| - CSSLengthTypeArray hasType;
|
| - hasType.ensureSize(CSSPrimitiveValue::LengthUnitTypeCount);
|
| - primitiveValue.accumulateLengthArray(valueArray, hasType);
|
| - hasPercentage = hasType.get(CSSPrimitiveValue::UnitTypePercentage);
|
| -
|
| - OwnPtr<InterpolableList> values = InterpolableList::create(CSSPrimitiveValue::LengthUnitTypeCount);
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++)
|
| - values->set(i, InterpolableNumber::create(valueArray.at(i)));
|
| -
|
| - return InterpolationComponent(values.release(), LengthNonInterpolableValue::create(hasPercentage));
|
| -}
|
| -
|
| -class ParentLengthChecker : public InterpolationType::ConversionChecker {
|
| -public:
|
| - static PassOwnPtr<ParentLengthChecker> create(const InterpolationType& type, CSSPropertyID property, const Length& length)
|
| - {
|
| - return adoptPtr(new ParentLengthChecker(type, property, length));
|
| - }
|
| -
|
| -private:
|
| - ParentLengthChecker(const InterpolationType& type, CSSPropertyID property, const Length& length)
|
| - : ConversionChecker(type)
|
| - , m_property(property)
|
| - , m_length(length)
|
| - { }
|
| -
|
| - bool isValid(const InterpolationEnvironment& environment, const UnderlyingValue&) const final
|
| - {
|
| - Length parentLength;
|
| - if (!LengthPropertyFunctions::getLength(m_property, *environment.state().parentStyle(), parentLength))
|
| - return false;
|
| - return parentLength == m_length;
|
| - }
|
| -
|
| - const CSSPropertyID m_property;
|
| - const Length m_length;
|
| -};
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertNeutral(const UnderlyingValue&, ConversionCheckers&) const
|
| -{
|
| - return InterpolationValue::create(*this, createNeutralInterpolableValue());
|
| -}
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertInitial() const
|
| -{
|
| - Length initialLength;
|
| - if (!LengthPropertyFunctions::getInitialLength(cssProperty(), initialLength))
|
| - return nullptr;
|
| - return maybeConvertLength(initialLength, 1);
|
| -}
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertInherit(const StyleResolverState* state, ConversionCheckers& conversionCheckers) const
|
| -{
|
| - if (!state || !state->parentStyle())
|
| - return nullptr;
|
| - Length inheritedLength;
|
| - if (!LengthPropertyFunctions::getLength(cssProperty(), *state->parentStyle(), inheritedLength))
|
| - return nullptr;
|
| - conversionCheckers.append(ParentLengthChecker::create(*this, cssProperty(), inheritedLength));
|
| - return maybeConvertLength(inheritedLength, effectiveZoom(*state->parentStyle()));
|
| -}
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertValue(const CSSValue& value, const StyleResolverState*, ConversionCheckers& conversionCheckers) const
|
| -{
|
| - if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).isValueID()) {
|
| - CSSValueID valueID = toCSSPrimitiveValue(value).getValueID();
|
| - double pixels;
|
| - if (!LengthPropertyFunctions::getPixelsForKeyword(cssProperty(), valueID, pixels))
|
| - return nullptr;
|
| - return InterpolationValue::create(*this, createInterpolablePixels(pixels));
|
| - }
|
| -
|
| - InterpolationComponent component = maybeConvertCSSValue(value);
|
| - if (!component)
|
| - return nullptr;
|
| - return InterpolationValue::create(*this, component);
|
| -}
|
| -
|
| -PassOwnPtr<InterpolationValue> LengthInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const
|
| -{
|
| - Length underlyingLength;
|
| - if (!LengthPropertyFunctions::getLength(cssProperty(), *environment.state().style(), underlyingLength))
|
| - return nullptr;
|
| - return maybeConvertLength(underlyingLength, effectiveZoom(*environment.state().style()));
|
| -}
|
| -
|
| -PassOwnPtr<PairwisePrimitiveInterpolation> LengthInterpolationType::mergeSingleConversions(InterpolationValue& startValue, InterpolationValue& endValue) const
|
| -{
|
| - return PairwisePrimitiveInterpolation::create(*this,
|
| - startValue.mutableComponent().interpolableValue.release(),
|
| - endValue.mutableComponent().interpolableValue.release(),
|
| - LengthNonInterpolableValue::merge(startValue.nonInterpolableValue(), endValue.nonInterpolableValue()));
|
| -}
|
| -
|
| -void LengthInterpolationType::composite(UnderlyingValue& underlyingValue, double underlyingFraction, const InterpolationValue& value) const
|
| -{
|
| - InterpolationComponent& underlyingComponent = underlyingValue.mutableComponent();
|
| - underlyingComponent.interpolableValue->scaleAndAdd(underlyingFraction, value.interpolableValue());
|
| - underlyingComponent.nonInterpolableValue = LengthNonInterpolableValue::merge(underlyingValue->nonInterpolableValue(), value.nonInterpolableValue());
|
| -}
|
| -
|
| -static bool isPixelsOrPercentOnly(const InterpolableList& values)
|
| -{
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
|
| - if (i == CSSPrimitiveValue::UnitTypePixels || i == CSSPrimitiveValue::UnitTypePercentage)
|
| - continue;
|
| - if (toInterpolableNumber(values.get(i))->value())
|
| - return false;
|
| - }
|
| - return true;
|
| -}
|
| -
|
| -// TODO(alancutter): Move this to Length.h.
|
| -static double clampToRange(double x, ValueRange range)
|
| -{
|
| - return (range == ValueRangeNonNegative && x < 0) ? 0 : x;
|
| -}
|
| -
|
| -static Length createLength(double pixels, double percentage, bool hasPercentage, ValueRange range)
|
| -{
|
| - ASSERT(hasPercentage || percentage == 0);
|
| - if (pixels && hasPercentage)
|
| - return Length(CalculationValue::create(PixelsAndPercent(pixels, percentage), range));
|
| - if (hasPercentage)
|
| - return Length(clampToRange(percentage, range), Percent);
|
| - return Length(CSSPrimitiveValue::clampToCSSLengthRange(clampToRange(pixels, range)), Fixed);
|
| -}
|
| -
|
| -static Length resolveInterpolablePixelsOrPercentageLength(const InterpolableList& values, bool hasPercentage, ValueRange range, double zoom)
|
| -{
|
| - ASSERT(isPixelsOrPercentOnly(values));
|
| - double pixels = toInterpolableNumber(values.get(CSSPrimitiveValue::UnitTypePixels))->value() * zoom;
|
| - double percentage = toInterpolableNumber(values.get(CSSPrimitiveValue::UnitTypePercentage))->value();
|
| - return createLength(pixels, percentage, hasPercentage, range);
|
| -}
|
| -
|
| -Length LengthInterpolationType::resolveInterpolableLength(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, const CSSToLengthConversionData& conversionData, ValueRange range)
|
| -{
|
| - const InterpolableList& interpolableList = toInterpolableList(interpolableValue);
|
| - bool hasPercentage = LengthNonInterpolableValue::hasPercentage(nonInterpolableValue);
|
| - double pixels = 0;
|
| - double percentage = 0;
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
|
| - double value = toInterpolableNumber(*interpolableList.get(i)).value();
|
| - if (i == CSSPrimitiveValue::UnitTypePercentage) {
|
| - percentage = value;
|
| - } else {
|
| - CSSPrimitiveValue::UnitType type = CSSPrimitiveValue::lengthUnitTypeToUnitType(static_cast<CSSPrimitiveValue::LengthUnitType>(i));
|
| - pixels += conversionData.zoomedComputedPixels(value, type);
|
| - }
|
| - }
|
| - return createLength(pixels, percentage, hasPercentage, range);
|
| -}
|
| -
|
| -static CSSPrimitiveValue::UnitType toUnitType(int lengthUnitType)
|
| -{
|
| - return static_cast<CSSPrimitiveValue::UnitType>(CSSPrimitiveValue::lengthUnitTypeToUnitType(static_cast<CSSPrimitiveValue::LengthUnitType>(lengthUnitType)));
|
| -}
|
| -
|
| -static PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> createCalcExpression(const InterpolableList& values, bool hasPercentage)
|
| -{
|
| - RefPtrWillBeRawPtr<CSSCalcExpressionNode> result = nullptr;
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
|
| - double value = toInterpolableNumber(values.get(i))->value();
|
| - if (value || (i == CSSPrimitiveValue::UnitTypePercentage && hasPercentage)) {
|
| - RefPtrWillBeRawPtr<CSSCalcExpressionNode> node = CSSCalcValue::createExpressionNode(CSSPrimitiveValue::create(value, toUnitType(i)));
|
| - result = result ? CSSCalcValue::createExpressionNode(result.release(), node.release(), CalcAdd) : node.release();
|
| - }
|
| - }
|
| - ASSERT(result);
|
| - return result.release();
|
| -}
|
| -
|
| -static PassRefPtrWillBeRawPtr<CSSValue> createCSSValue(const InterpolableList& values, bool hasPercentage, ValueRange range)
|
| -{
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> result;
|
| - size_t firstUnitIndex = CSSPrimitiveValue::LengthUnitTypeCount;
|
| - size_t unitTypeCount = 0;
|
| - for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; i++) {
|
| - if ((hasPercentage && i == CSSPrimitiveValue::UnitTypePercentage) || toInterpolableNumber(values.get(i))->value()) {
|
| - unitTypeCount++;
|
| - if (unitTypeCount == 1)
|
| - firstUnitIndex = i;
|
| - }
|
| - }
|
| - switch (unitTypeCount) {
|
| - case 0:
|
| - return CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::Pixels);
|
| - case 1: {
|
| - double value = clampToRange(toInterpolableNumber(values.get(firstUnitIndex))->value(), range);
|
| - return CSSPrimitiveValue::create(value, toUnitType(firstUnitIndex));
|
| - }
|
| - default:
|
| - return CSSPrimitiveValue::create(CSSCalcValue::create(createCalcExpression(values, hasPercentage), range));
|
| - }
|
| -}
|
| -
|
| -void LengthInterpolationType::apply(const InterpolableValue& interpolableValue, const NonInterpolableValue* nonInterpolableValue, InterpolationEnvironment& environment) const
|
| -{
|
| - StyleResolverState& state = environment.state();
|
| - const InterpolableList& values = toInterpolableList(interpolableValue);
|
| - bool hasPercentage = LengthNonInterpolableValue::hasPercentage(nonInterpolableValue);
|
| - if (isPixelsOrPercentOnly(values)) {
|
| - Length length = resolveInterpolablePixelsOrPercentageLength(values, hasPercentage, m_valueRange, effectiveZoom(*state.style()));
|
| - if (LengthPropertyFunctions::setLength(cssProperty(), *state.style(), length)) {
|
| -#if ENABLE(ASSERT)
|
| - // Assert that setting the length on ComputedStyle directly is identical to the AnimatableValue code path.
|
| - RefPtr<AnimatableValue> before = CSSAnimatableValueFactory::create(cssProperty(), *state.style());
|
| - StyleBuilder::applyProperty(cssProperty(), state, createCSSValue(values, hasPercentage, m_valueRange).get());
|
| - RefPtr<AnimatableValue> after = CSSAnimatableValueFactory::create(cssProperty(), *state.style());
|
| - ASSERT(before->equals(*after));
|
| -#endif
|
| - return;
|
| - }
|
| - }
|
| - StyleBuilder::applyProperty(cssProperty(), state, createCSSValue(values, hasPercentage, m_valueRange).get());
|
| -}
|
| -
|
| -} // namespace blink
|
|
|