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

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

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Rebase please work Created 4 years, 3 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/CSSFontSizeInterpolationType.cpp
diff --git a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
index ec3b822849e8f6883904e6308d7c2b3a1321ce39..706da1d1f22dbcd0c17becbaf70ae5dd7472da53 100644
--- a/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
+++ b/third_party/WebKit/Source/core/animation/CSSFontSizeInterpolationType.cpp
@@ -5,7 +5,7 @@
#include "core/animation/CSSFontSizeInterpolationType.h"
#include "core/animation/LengthInterpolationFunctions.h"
-#include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSIdentifierValue.h"
#include "core/css/resolver/StyleResolverState.h"
#include "platform/LengthFunctions.h"
#include "platform/fonts/FontDescription.h"
@@ -103,10 +103,10 @@ InterpolationValue CSSFontSizeInterpolationType::maybeConvertValue(const CSSValu
if (result)
return InterpolationValue(std::move(result));
- if (!value.isPrimitiveValue() || !toCSSPrimitiveValue(value).isValueID())
+ if (!value.isIdentifierValue())
return nullptr;
- return maybeConvertKeyword(toCSSPrimitiveValue(value).getValueID(), state, conversionCheckers);
+ return maybeConvertKeyword(toCSSIdentifierValue(value).getValueID(), state, conversionCheckers);
}
InterpolationValue CSSFontSizeInterpolationType::maybeConvertUnderlyingValue(const InterpolationEnvironment& environment) const

Powered by Google App Engine
This is Rietveld 408576698