Bug 718539. Initialize font features in gfxFontStyle from nsFont data. r=dbaron

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -2587,6 +2587,8 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
                        fontStyle->mFont.featureSettings,
                        fontStyle->mFont.languageOverride);
 
+    fontStyle->mFont.AddFontFeaturesToStyle(&style);
+
     CurrentState().fontGroup =
         gfxPlatform::GetPlatform()->CreateFontGroup(fontStyle->mFont.name,
                                                     &style,

content/canvas/src/nsCanvasRenderingContext2DAzure.cpp

@@ -2800,6 +2800,8 @@ nsCanvasRenderingContext2DAzure::SetFont(const nsAString& font)
                       fontStyle->mFont.featureSettings,
                       fontStyle->mFont.languageOverride);
 
+  fontStyle->mFont.AddFontFeaturesToStyle(&style);
+
   CurrentState().fontGroup =
       gfxPlatform::GetPlatform()->CreateFontGroup(fontStyle->mFont.name,
                                                   &style,

gfx/src/nsFontMetrics.cpp

@@ -137,6 +137,8 @@ nsFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
                        aFont.featureSettings,
                        aFont.languageOverride);
 
+    aFont.AddFontFeaturesToStyle(&style);
+
     mFontGroup = gfxPlatform::GetPlatform()->
         CreateFontGroup(aFont.name, &style, aUserFontSet);
     if (mFontGroup->FontListLength() < 1)

layout/svg/base/src/nsSVGGlyphFrame.cpp

@@ -1608,6 +1608,8 @@ nsSVGGlyphFrame::EnsureTextRun(float *aDrawScale, float *aMetricsScale,
                            font.featureSettings,
                            font.languageOverride);
 
+    font.AddFontFeaturesToStyle(&fontStyle);
+
     nsRefPtr<gfxFontGroup> fontGroup =
       gfxPlatform::GetPlatform()->CreateFontGroup(font.name, &fontStyle, presContext->GetUserFontSet());