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

Unified Diff: third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp

Issue 2891743003: Enable interpolation of CSS property font-variation-settings (Closed)
Patch Set: updatetest Created 3 years, 7 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/css/CSSAnimatableValueFactory.cpp
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
index e3c0f3633b192fdf7e02e5d4a1b8180a2a5e13b5..6e3554095a015ae18ea45ef7080810f33291190c 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
@@ -39,6 +39,7 @@
#include "core/animation/animatable/AnimatableDouble.h"
#include "core/animation/animatable/AnimatableDoubleAndBool.h"
#include "core/animation/animatable/AnimatableFilterOperations.h"
+#include "core/animation/animatable/AnimatableFontVariationSettings.h"
#include "core/animation/animatable/AnimatableImage.h"
#include "core/animation/animatable/AnimatableLength.h"
#include "core/animation/animatable/AnimatableLengthBox.h"
@@ -300,6 +301,11 @@ static PassRefPtr<AnimatableValue> CreateFromFontStretch(
return CreateFromDouble(FontStretchToDouble(font_stretch));
}
+static PassRefPtr<AnimatableValue> CreateFromFontVariationSettings(
+ FontVariationSettings* settings) {
+ return AnimatableFontVariationSettings::Create(settings);
+}
+
static PassRefPtr<AnimatableValue> CreateFromTransformProperties(
PassRefPtr<TransformOperation> transform,
double zoom,
@@ -446,6 +452,9 @@ PassRefPtr<AnimatableValue> CSSAnimatableValueFactory::Create(
: AnimatableUnknown::Create(CSSValueNone);
case CSSPropertyFontStretch:
return CreateFromFontStretch(style.GetFontStretch());
+ case CSSPropertyFontVariationSettings:
+ return CreateFromFontVariationSettings(
+ style.GetFontDescription().VariationSettings());
case CSSPropertyFontWeight:
return CreateFromFontWeight(style.GetFontWeight());
case CSSPropertyHeight:

Powered by Google App Engine
This is Rietveld 408576698