Merge branch 'redwood' into 28.9-platform

1 files changed, 13 insertions, 3 deletions

diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 647f7f6dc..910c1de8a 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -674,9 +674,9 @@ nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush)
     mPresShell->GetPresContext()->GetRestyleGeneration();
 
   if (mStyleContext) {
-    // We can't rely on the undisplayed restyle generation if mElement is

-    // out-of-document, since that generation is not incremented for DOM changes

-    // on out-of-document elements.

+    // We can't rely on the undisplayed restyle generation if mElement is
+    // out-of-document, since that generation is not incremented for DOM changes
+    // on out-of-document elements.
     if (mStyleContextGeneration == currentGeneration &&
         mElement->IsInComposedDoc()) {
       // Our cached style context is still valid.
@@ -1620,6 +1620,16 @@ nsComputedDOMStyle::DoGetFontFeatureSettings()
 }
 
 already_AddRefed<CSSValue>
+nsComputedDOMStyle::DoGetFontVariationSettings()
+{
+  // TODO: This is still a stub, always returning "normal"
+  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
+
+  val->SetIdent(eCSSKeyword_normal);
+  return val.forget();
+}
+
+already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetFontKerning()
 {
   RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;