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

Unified Diff: third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp

Issue 2555923003: Make InvalidatableInterpolation's InterpolationTypes decided at effect application time (Closed)
Patch Set: Extended InterpolationTypesMap lifetime scope to fix release crash Created 4 years 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: third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp
diff --git a/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp b/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp
deleted file mode 100644
index dd28e10296528f491712f57a77a62ee9efb2f431..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/core/animation/PropertyInterpolationTypesMapping.cpp
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright 2016 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 "core/animation/PropertyInterpolationTypesMapping.h"
-
-#include "core/HTMLNames.h"
-#include "core/animation/CSSBasicShapeInterpolationType.h"
-#include "core/animation/CSSBorderImageLengthBoxInterpolationType.h"
-#include "core/animation/CSSClipInterpolationType.h"
-#include "core/animation/CSSColorInterpolationType.h"
-#include "core/animation/CSSFilterListInterpolationType.h"
-#include "core/animation/CSSFontSizeInterpolationType.h"
-#include "core/animation/CSSFontWeightInterpolationType.h"
-#include "core/animation/CSSImageInterpolationType.h"
-#include "core/animation/CSSImageListInterpolationType.h"
-#include "core/animation/CSSImageSliceInterpolationType.h"
-#include "core/animation/CSSLengthInterpolationType.h"
-#include "core/animation/CSSLengthListInterpolationType.h"
-#include "core/animation/CSSLengthPairInterpolationType.h"
-#include "core/animation/CSSNumberInterpolationType.h"
-#include "core/animation/CSSOffsetRotationInterpolationType.h"
-#include "core/animation/CSSPaintInterpolationType.h"
-#include "core/animation/CSSPathInterpolationType.h"
-#include "core/animation/CSSPositionAxisListInterpolationType.h"
-#include "core/animation/CSSPositionInterpolationType.h"
-#include "core/animation/CSSRotateInterpolationType.h"
-#include "core/animation/CSSScaleInterpolationType.h"
-#include "core/animation/CSSShadowListInterpolationType.h"
-#include "core/animation/CSSSizeListInterpolationType.h"
-#include "core/animation/CSSTextIndentInterpolationType.h"
-#include "core/animation/CSSTransformInterpolationType.h"
-#include "core/animation/CSSTransformOriginInterpolationType.h"
-#include "core/animation/CSSTranslateInterpolationType.h"
-#include "core/animation/CSSValueInterpolationType.h"
-#include "core/animation/CSSVisibilityInterpolationType.h"
-#include "core/animation/InterpolationType.h"
-#include "core/animation/SVGAngleInterpolationType.h"
-#include "core/animation/SVGIntegerInterpolationType.h"
-#include "core/animation/SVGIntegerOptionalIntegerInterpolationType.h"
-#include "core/animation/SVGLengthInterpolationType.h"
-#include "core/animation/SVGLengthListInterpolationType.h"
-#include "core/animation/SVGNumberInterpolationType.h"
-#include "core/animation/SVGNumberListInterpolationType.h"
-#include "core/animation/SVGNumberOptionalNumberInterpolationType.h"
-#include "core/animation/SVGPathInterpolationType.h"
-#include "core/animation/SVGPointListInterpolationType.h"
-#include "core/animation/SVGRectInterpolationType.h"
-#include "core/animation/SVGTransformListInterpolationType.h"
-#include "core/animation/SVGValueInterpolationType.h"
-#include "core/css/CSSPropertyMetadata.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
-
-namespace blink {
-
-const InterpolationTypes& PropertyInterpolationTypesMapping::get(
- const PropertyHandle& property) {
- using ApplicableTypesMap =
- HashMap<PropertyHandle, std::unique_ptr<const InterpolationTypes>>;
- DEFINE_STATIC_LOCAL(ApplicableTypesMap, applicableTypesMap, ());
- auto entry = applicableTypesMap.find(property);
- if (entry != applicableTypesMap.end())
- return *entry->value.get();
-
- std::unique_ptr<InterpolationTypes> applicableTypes =
- WTF::makeUnique<InterpolationTypes>();
-
- if (property.isCSSProperty() || property.isPresentationAttribute()) {
- CSSPropertyID cssProperty = property.isCSSProperty()
- ? property.cssProperty()
- : property.presentationAttribute();
- // We treat presentation attributes identically to their CSS property
- // equivalents when interpolating.
- PropertyHandle usedProperty =
- property.isCSSProperty() ? property : PropertyHandle(cssProperty);
- switch (cssProperty) {
- case CSSPropertyBaselineShift:
- case CSSPropertyBorderBottomWidth:
- case CSSPropertyBorderLeftWidth:
- case CSSPropertyBorderRightWidth:
- case CSSPropertyBorderTopWidth:
- case CSSPropertyBottom:
- case CSSPropertyCx:
- case CSSPropertyCy:
- case CSSPropertyFlexBasis:
- case CSSPropertyHeight:
- case CSSPropertyLeft:
- case CSSPropertyLetterSpacing:
- case CSSPropertyMarginBottom:
- case CSSPropertyMarginLeft:
- case CSSPropertyMarginRight:
- case CSSPropertyMarginTop:
- case CSSPropertyMaxHeight:
- case CSSPropertyMaxWidth:
- case CSSPropertyMinHeight:
- case CSSPropertyMinWidth:
- case CSSPropertyOffsetDistance:
- case CSSPropertyOutlineOffset:
- case CSSPropertyOutlineWidth:
- case CSSPropertyPaddingBottom:
- case CSSPropertyPaddingLeft:
- case CSSPropertyPaddingRight:
- case CSSPropertyPaddingTop:
- case CSSPropertyPerspective:
- case CSSPropertyR:
- case CSSPropertyRight:
- case CSSPropertyRx:
- case CSSPropertyRy:
- case CSSPropertyShapeMargin:
- case CSSPropertyStrokeDashoffset:
- case CSSPropertyStrokeWidth:
- case CSSPropertyTop:
- case CSSPropertyVerticalAlign:
- case CSSPropertyWebkitBorderHorizontalSpacing:
- case CSSPropertyWebkitBorderVerticalSpacing:
- case CSSPropertyColumnGap:
- case CSSPropertyColumnRuleWidth:
- case CSSPropertyColumnWidth:
- case CSSPropertyWebkitPerspectiveOriginX:
- case CSSPropertyWebkitPerspectiveOriginY:
- case CSSPropertyWebkitTransformOriginX:
- case CSSPropertyWebkitTransformOriginY:
- case CSSPropertyWebkitTransformOriginZ:
- case CSSPropertyWidth:
- case CSSPropertyWordSpacing:
- case CSSPropertyX:
- case CSSPropertyY:
- applicableTypes->append(
- WTF::makeUnique<CSSLengthInterpolationType>(usedProperty));
- break;
- case CSSPropertyFlexGrow:
- case CSSPropertyFlexShrink:
- case CSSPropertyFillOpacity:
- case CSSPropertyFloodOpacity:
- case CSSPropertyFontSizeAdjust:
- case CSSPropertyOpacity:
- case CSSPropertyOrphans:
- case CSSPropertyShapeImageThreshold:
- case CSSPropertyStopOpacity:
- case CSSPropertyStrokeMiterlimit:
- case CSSPropertyStrokeOpacity:
- case CSSPropertyColumnCount:
- case CSSPropertyWidows:
- case CSSPropertyZIndex:
- applicableTypes->append(
- WTF::makeUnique<CSSNumberInterpolationType>(usedProperty));
- break;
- case CSSPropertyLineHeight:
- applicableTypes->append(
- WTF::makeUnique<CSSLengthInterpolationType>(usedProperty));
- applicableTypes->append(
- WTF::makeUnique<CSSNumberInterpolationType>(usedProperty));
- break;
- case CSSPropertyBackgroundColor:
- case CSSPropertyBorderBottomColor:
- case CSSPropertyBorderLeftColor:
- case CSSPropertyBorderRightColor:
- case CSSPropertyBorderTopColor:
- case CSSPropertyColor:
- case CSSPropertyFloodColor:
- case CSSPropertyLightingColor:
- case CSSPropertyOutlineColor:
- case CSSPropertyStopColor:
- case CSSPropertyTextDecorationColor:
- case CSSPropertyColumnRuleColor:
- case CSSPropertyWebkitTextStrokeColor:
- applicableTypes->append(
- WTF::makeUnique<CSSColorInterpolationType>(usedProperty));
- break;
- case CSSPropertyFill:
- case CSSPropertyStroke:
- applicableTypes->append(
- WTF::makeUnique<CSSPaintInterpolationType>(usedProperty));
- break;
- case CSSPropertyD:
- applicableTypes->append(
- WTF::makeUnique<CSSPathInterpolationType>(usedProperty));
- break;
- case CSSPropertyBoxShadow:
- case CSSPropertyTextShadow:
- applicableTypes->append(
- WTF::makeUnique<CSSShadowListInterpolationType>(usedProperty));
- break;
- case CSSPropertyBorderImageSource:
- case CSSPropertyListStyleImage:
- case CSSPropertyWebkitMaskBoxImageSource:
- applicableTypes->append(
- WTF::makeUnique<CSSImageInterpolationType>(usedProperty));
- break;
- case CSSPropertyBackgroundImage:
- case CSSPropertyWebkitMaskImage:
- applicableTypes->append(
- WTF::makeUnique<CSSImageListInterpolationType>(usedProperty));
- break;
- case CSSPropertyStrokeDasharray:
- applicableTypes->append(
- WTF::makeUnique<CSSLengthListInterpolationType>(usedProperty));
- break;
- case CSSPropertyFontWeight:
- applicableTypes->append(
- WTF::makeUnique<CSSFontWeightInterpolationType>(usedProperty));
- break;
- case CSSPropertyVisibility:
- applicableTypes->append(
- WTF::makeUnique<CSSVisibilityInterpolationType>(usedProperty));
- break;
- case CSSPropertyClip:
- applicableTypes->append(
- WTF::makeUnique<CSSClipInterpolationType>(usedProperty));
- break;
- case CSSPropertyOffsetRotate:
- case CSSPropertyOffsetRotation:
- applicableTypes->append(
- WTF::makeUnique<CSSOffsetRotationInterpolationType>(usedProperty));
- break;
- case CSSPropertyBackgroundPositionX:
- case CSSPropertyBackgroundPositionY:
- case CSSPropertyWebkitMaskPositionX:
- case CSSPropertyWebkitMaskPositionY:
- applicableTypes->append(
- WTF::makeUnique<CSSPositionAxisListInterpolationType>(
- usedProperty));
- break;
- case CSSPropertyObjectPosition:
- case CSSPropertyOffsetAnchor:
- case CSSPropertyOffsetPosition:
- case CSSPropertyPerspectiveOrigin:
- applicableTypes->append(
- WTF::makeUnique<CSSPositionInterpolationType>(usedProperty));
- break;
- case CSSPropertyBorderBottomLeftRadius:
- case CSSPropertyBorderBottomRightRadius:
- case CSSPropertyBorderTopLeftRadius:
- case CSSPropertyBorderTopRightRadius:
- applicableTypes->append(
- WTF::makeUnique<CSSLengthPairInterpolationType>(usedProperty));
- break;
- case CSSPropertyTranslate:
- applicableTypes->append(
- WTF::makeUnique<CSSTranslateInterpolationType>(usedProperty));
- break;
- case CSSPropertyTransformOrigin:
- applicableTypes->append(
- WTF::makeUnique<CSSTransformOriginInterpolationType>(usedProperty));
- break;
- case CSSPropertyBackgroundSize:
- case CSSPropertyWebkitMaskSize:
- applicableTypes->append(
- WTF::makeUnique<CSSSizeListInterpolationType>(usedProperty));
- break;
- case CSSPropertyBorderImageOutset:
- case CSSPropertyBorderImageWidth:
- case CSSPropertyWebkitMaskBoxImageOutset:
- case CSSPropertyWebkitMaskBoxImageWidth:
- applicableTypes->append(WTF::wrapUnique(
- new CSSBorderImageLengthBoxInterpolationType(usedProperty)));
- break;
- case CSSPropertyScale:
- applicableTypes->append(
- WTF::makeUnique<CSSScaleInterpolationType>(usedProperty));
- break;
- case CSSPropertyFontSize:
- applicableTypes->append(
- WTF::makeUnique<CSSFontSizeInterpolationType>(usedProperty));
- break;
- case CSSPropertyTextIndent:
- applicableTypes->append(
- WTF::makeUnique<CSSTextIndentInterpolationType>(usedProperty));
- break;
- case CSSPropertyBorderImageSlice:
- case CSSPropertyWebkitMaskBoxImageSlice:
- applicableTypes->append(
- WTF::makeUnique<CSSImageSliceInterpolationType>(usedProperty));
- break;
- case CSSPropertyClipPath:
- case CSSPropertyShapeOutside:
- applicableTypes->append(
- WTF::makeUnique<CSSBasicShapeInterpolationType>(usedProperty));
- break;
- case CSSPropertyRotate:
- applicableTypes->append(
- WTF::makeUnique<CSSRotateInterpolationType>(usedProperty));
- break;
- case CSSPropertyBackdropFilter:
- case CSSPropertyFilter:
- applicableTypes->append(
- WTF::makeUnique<CSSFilterListInterpolationType>(usedProperty));
- break;
- case CSSPropertyTransform:
- applicableTypes->append(
- WTF::makeUnique<CSSTransformInterpolationType>(usedProperty));
- break;
- default:
- DCHECK(!CSSPropertyMetadata::isInterpolableProperty(cssProperty));
- }
-
- applicableTypes->append(
- WTF::makeUnique<CSSValueInterpolationType>(usedProperty));
-
- } else {
- const QualifiedName& attribute = property.svgAttribute();
- if (attribute == SVGNames::orientAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGAngleInterpolationType>(attribute));
- } else if (attribute == SVGNames::numOctavesAttr ||
- attribute == SVGNames::targetXAttr ||
- attribute == SVGNames::targetYAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGIntegerInterpolationType>(attribute));
- } else if (attribute == SVGNames::orderAttr) {
- applicableTypes->append(WTF::wrapUnique(
- new SVGIntegerOptionalIntegerInterpolationType(attribute)));
- } else if (attribute == SVGNames::cxAttr || attribute == SVGNames::cyAttr ||
- attribute == SVGNames::fxAttr || attribute == SVGNames::fyAttr ||
- attribute == SVGNames::heightAttr ||
- attribute == SVGNames::markerHeightAttr ||
- attribute == SVGNames::markerWidthAttr ||
- attribute == SVGNames::rAttr ||
- attribute == SVGNames::refXAttr ||
- attribute == SVGNames::refYAttr ||
- attribute == SVGNames::rxAttr || attribute == SVGNames::ryAttr ||
- attribute == SVGNames::startOffsetAttr ||
- attribute == SVGNames::textLengthAttr ||
- attribute == SVGNames::widthAttr ||
- attribute == SVGNames::x1Attr || attribute == SVGNames::x2Attr ||
- attribute == SVGNames::y1Attr || attribute == SVGNames::y2Attr) {
- applicableTypes->append(
- WTF::makeUnique<SVGLengthInterpolationType>(attribute));
- } else if (attribute == SVGNames::dxAttr || attribute == SVGNames::dyAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGNumberInterpolationType>(attribute));
- applicableTypes->append(
- WTF::makeUnique<SVGLengthListInterpolationType>(attribute));
- } else if (attribute == SVGNames::xAttr || attribute == SVGNames::yAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGLengthInterpolationType>(attribute));
- applicableTypes->append(
- WTF::makeUnique<SVGLengthListInterpolationType>(attribute));
- } else if (attribute == SVGNames::amplitudeAttr ||
- attribute == SVGNames::azimuthAttr ||
- attribute == SVGNames::biasAttr ||
- attribute == SVGNames::diffuseConstantAttr ||
- attribute == SVGNames::divisorAttr ||
- attribute == SVGNames::elevationAttr ||
- attribute == SVGNames::exponentAttr ||
- attribute == SVGNames::interceptAttr ||
- attribute == SVGNames::k1Attr || attribute == SVGNames::k2Attr ||
- attribute == SVGNames::k3Attr || attribute == SVGNames::k4Attr ||
- attribute == SVGNames::limitingConeAngleAttr ||
- attribute == SVGNames::offsetAttr ||
- attribute == SVGNames::pathLengthAttr ||
- attribute == SVGNames::pointsAtXAttr ||
- attribute == SVGNames::pointsAtYAttr ||
- attribute == SVGNames::pointsAtZAttr ||
- attribute == SVGNames::scaleAttr ||
- attribute == SVGNames::seedAttr ||
- attribute == SVGNames::slopeAttr ||
- attribute == SVGNames::specularConstantAttr ||
- attribute == SVGNames::specularExponentAttr ||
- attribute == SVGNames::surfaceScaleAttr ||
- attribute == SVGNames::zAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGNumberInterpolationType>(attribute));
- } else if (attribute == SVGNames::kernelMatrixAttr ||
- attribute == SVGNames::rotateAttr ||
- attribute == SVGNames::tableValuesAttr ||
- attribute == SVGNames::valuesAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGNumberListInterpolationType>(attribute));
- } else if (attribute == SVGNames::baseFrequencyAttr ||
- attribute == SVGNames::kernelUnitLengthAttr ||
- attribute == SVGNames::radiusAttr ||
- attribute == SVGNames::stdDeviationAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGNumberOptionalNumberInterpolationType>(attribute));
- } else if (attribute == SVGNames::dAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGPathInterpolationType>(attribute));
- } else if (attribute == SVGNames::pointsAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGPointListInterpolationType>(attribute));
- } else if (attribute == SVGNames::viewBoxAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGRectInterpolationType>(attribute));
- } else if (attribute == SVGNames::gradientTransformAttr ||
- attribute == SVGNames::patternTransformAttr ||
- attribute == SVGNames::transformAttr) {
- applicableTypes->append(
- WTF::makeUnique<SVGTransformListInterpolationType>(attribute));
- } else if (attribute == HTMLNames::classAttr ||
- attribute == SVGNames::clipPathUnitsAttr ||
- attribute == SVGNames::edgeModeAttr ||
- attribute == SVGNames::filterUnitsAttr ||
- attribute == SVGNames::gradientUnitsAttr ||
- attribute == SVGNames::hrefAttr ||
- attribute == SVGNames::inAttr ||
- attribute == SVGNames::in2Attr ||
- attribute == SVGNames::lengthAdjustAttr ||
- attribute == SVGNames::markerUnitsAttr ||
- attribute == SVGNames::maskContentUnitsAttr ||
- attribute == SVGNames::maskUnitsAttr ||
- attribute == SVGNames::methodAttr ||
- attribute == SVGNames::modeAttr ||
- attribute == SVGNames::operatorAttr ||
- attribute == SVGNames::patternContentUnitsAttr ||
- attribute == SVGNames::patternUnitsAttr ||
- attribute == SVGNames::preserveAlphaAttr ||
- attribute == SVGNames::preserveAspectRatioAttr ||
- attribute == SVGNames::primitiveUnitsAttr ||
- attribute == SVGNames::resultAttr ||
- attribute == SVGNames::spacingAttr ||
- attribute == SVGNames::spreadMethodAttr ||
- attribute == SVGNames::stitchTilesAttr ||
- attribute == SVGNames::targetAttr ||
- attribute == SVGNames::typeAttr ||
- attribute == SVGNames::xChannelSelectorAttr ||
- attribute == SVGNames::yChannelSelectorAttr) {
- // Use default SVGValueInterpolationType.
- } else {
- NOTREACHED();
- }
-
- applicableTypes->append(
- WTF::makeUnique<SVGValueInterpolationType>(attribute));
- }
-
- auto addResult = applicableTypesMap.add(property, std::move(applicableTypes));
- return *addResult.storedValue->value.get();
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698