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

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

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Rebase Created 5 years, 2 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: third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
diff --git a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
index c5bdbe4bcff3da7bd054165da32e49910a79185f..28cb9f3643c4da35344fa666d2cc811a0cc425f9 100644
--- a/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
+++ b/third_party/WebKit/Source/core/animation/DeferredLegacyStyleInterpolation.cpp
@@ -56,6 +56,8 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
return interpolationRequiresStyleResolve(toCSSBasicShapePolygonValue(value));
if (value.isBasicShapeInsetValue())
return interpolationRequiresStyleResolve(toCSSBasicShapeInsetValue(value));
+ if (value.isStringValue() || value.isURIValue() || value.isCustomIdentValue())
+ return false;
if (value.isPrimitiveValue())
return interpolationRequiresStyleResolve(toCSSPrimitiveValue(value));
if (value.isQuadValue())
@@ -77,7 +79,7 @@ bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const C
bool DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(const CSSPrimitiveValue& primitiveValue)
{
// FIXME: consider other types.
- if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle() || primitiveValue.isRGBColor() || primitiveValue.isURI())
+ if (primitiveValue.isNumber() || primitiveValue.isPercentage() || primitiveValue.isAngle() || primitiveValue.isRGBColor())
return false;
if (primitiveValue.isLength())

Powered by Google App Engine
This is Rietveld 408576698