diff --git a/components/style/binding_tools/regen.py b/components/style/binding_tools/regen.py
index 49593e91f74..da703c497ff 100755
--- a/components/style/binding_tools/regen.py
+++ b/components/style/binding_tools/regen.py
@@ -74,8 +74,7 @@ COMPILATION_TARGETS = {
         "whitelist_vars": [
             "NS_THEME_.*",
             "NODE_.*",
-            "NS_FONT_STRETCH_.*",
-            "NS_FONT_STYLE_.*",
+            "NS_FONT_.*",
             "NS_STYLE_.*",
             "NS_CORNER_.*",
             "NS_RADIUS_.*",
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
index 118ecd6d174..28eddab1b5a 100644
--- a/components/style/gecko_bindings/structs_debug.rs
+++ b/components/style/gecko_bindings/structs_debug.rs
@@ -28,6 +28,9 @@ impl <T> ::std::marker::Copy for __BindgenUnionField<T> { }
 pub const NS_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
+pub const NS_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
+pub const NS_FONT_WEIGHT_THIN: ::std::os::raw::c_uint = 100;
 pub const NS_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
 pub const NS_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
 pub const NS_FONT_STRETCH_CONDENSED: ::std::os::raw::c_int = -2;
@@ -37,6 +40,71 @@ pub const NS_FONT_STRETCH_SEMI_EXPANDED: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STRETCH_EXPANDED: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_STRETCH_EXTRA_EXPANDED: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_STRETCH_ULTRA_EXPANDED: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_SMOOTHING_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_SMOOTHING_GRAYSCALE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_KERNING_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_KERNING_NONE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_KERNING_NORMAL: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_SYNTHESIS_WEIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_SYNTHESIS_STYLE: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_DISPLAY_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_DISPLAY_BLOCK: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_DISPLAY_SWAP: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_DISPLAY_FALLBACK: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_DISPLAY_OPTIONAL: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_STYLESET: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT: ::std::os::raw::c_uint
+          =
+    1;
+pub const NS_FONT_VARIANT_ALTERNATES_SWASH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_CAPS_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_CAPS_SMALLCAPS: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_CAPS_ALLSMALL: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_CAPS_PETITECAPS: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_VARIANT_CAPS_ALLPETITE: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_VARIANT_CAPS_TITLING: ::std::os::raw::c_uint = 5;
+pub const NS_FONT_VARIANT_CAPS_UNICASE: ::std::os::raw::c_uint = 6;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NONE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_COMMON: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_LINING: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_TABULAR: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_ORDINAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_POSITION_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_POSITION_SUPER: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_POSITION_SUB: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_WIDTH_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_WIDTH_FULL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_WIDTH_HALF: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_WIDTH_THIRD: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_VARIANT_WIDTH_QUARTER: ::std::os::raw::c_uint = 4;
 pub const NS_THEME_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_THEME_BUTTON: ::std::os::raw::c_uint = 1;
 pub const NS_THEME_RADIO: ::std::os::raw::c_uint = 2;
@@ -160,6 +228,8 @@ pub const NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN: ::std::os::raw::c_uint = 245;
 pub const NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED: ::std::os::raw::c_uint = 246;
 pub const NS_THEME_GTK_INFO_BAR: ::std::os::raw::c_uint = 247;
 pub const NS_THEME_MAC_SOURCE_LIST: ::std::os::raw::c_uint = 248;
+pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
 pub const NS_CORNER_TOP_LEFT_X: ::std::os::raw::c_uint = 0;
 pub const NS_CORNER_TOP_LEFT_Y: ::std::os::raw::c_uint = 1;
 pub const NS_CORNER_TOP_RIGHT_X: ::std::os::raw::c_uint = 2;
diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
index 359061c330a..3603c6a5198 100644
--- a/components/style/gecko_bindings/structs_release.rs
+++ b/components/style/gecko_bindings/structs_release.rs
@@ -28,6 +28,9 @@ impl <T> ::std::marker::Copy for __BindgenUnionField<T> { }
 pub const NS_FONT_STYLE_NORMAL: ::std::os::raw::c_uint = 0;
 pub const NS_FONT_STYLE_ITALIC: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STYLE_OBLIQUE: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_WEIGHT_NORMAL: ::std::os::raw::c_uint = 400;
+pub const NS_FONT_WEIGHT_BOLD: ::std::os::raw::c_uint = 700;
+pub const NS_FONT_WEIGHT_THIN: ::std::os::raw::c_uint = 100;
 pub const NS_FONT_STRETCH_ULTRA_CONDENSED: ::std::os::raw::c_int = -4;
 pub const NS_FONT_STRETCH_EXTRA_CONDENSED: ::std::os::raw::c_int = -3;
 pub const NS_FONT_STRETCH_CONDENSED: ::std::os::raw::c_int = -2;
@@ -37,6 +40,71 @@ pub const NS_FONT_STRETCH_SEMI_EXPANDED: ::std::os::raw::c_uint = 1;
 pub const NS_FONT_STRETCH_EXPANDED: ::std::os::raw::c_uint = 2;
 pub const NS_FONT_STRETCH_EXTRA_EXPANDED: ::std::os::raw::c_uint = 3;
 pub const NS_FONT_STRETCH_ULTRA_EXPANDED: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_SMOOTHING_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_SMOOTHING_GRAYSCALE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_KERNING_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_KERNING_NONE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_KERNING_NORMAL: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_SYNTHESIS_WEIGHT: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_SYNTHESIS_STYLE: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_DISPLAY_AUTO: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_DISPLAY_BLOCK: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_DISPLAY_SWAP: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_DISPLAY_FALLBACK: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_DISPLAY_OPTIONAL: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_VARIANT_ALTERNATES_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_STYLISTIC: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_STYLESET: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT: ::std::os::raw::c_uint
+          =
+    1;
+pub const NS_FONT_VARIANT_ALTERNATES_SWASH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_ORNAMENTS: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_ALTERNATES_ANNOTATION: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_CAPS_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_CAPS_SMALLCAPS: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_CAPS_ALLSMALL: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_CAPS_PETITECAPS: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_VARIANT_CAPS_ALLPETITE: ::std::os::raw::c_uint = 4;
+pub const NS_FONT_VARIANT_CAPS_TITLING: ::std::os::raw::c_uint = 5;
+pub const NS_FONT_VARIANT_CAPS_UNICASE: ::std::os::raw::c_uint = 6;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS78: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS83: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS90: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_JIS04: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_PROP_WIDTH: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_EAST_ASIAN_RUBY: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NONE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_COMMON: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_COMMON: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_DISCRETIONARY: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_LIGATURES_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_HISTORICAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_CONTEXTUAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_LINING: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_OLDSTYLE: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_PROPORTIONAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_TABULAR: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS: ::std::os::raw::c_uint =
+    1;
+pub const NS_FONT_VARIANT_NUMERIC_SLASHZERO: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_NUMERIC_ORDINAL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_POSITION_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_POSITION_SUPER: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_POSITION_SUB: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_WIDTH_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_WIDTH_FULL: ::std::os::raw::c_uint = 1;
+pub const NS_FONT_VARIANT_WIDTH_HALF: ::std::os::raw::c_uint = 2;
+pub const NS_FONT_VARIANT_WIDTH_THIRD: ::std::os::raw::c_uint = 3;
+pub const NS_FONT_VARIANT_WIDTH_QUARTER: ::std::os::raw::c_uint = 4;
 pub const NS_THEME_NONE: ::std::os::raw::c_uint = 0;
 pub const NS_THEME_BUTTON: ::std::os::raw::c_uint = 1;
 pub const NS_THEME_RADIO: ::std::os::raw::c_uint = 2;
@@ -160,6 +228,8 @@ pub const NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN: ::std::os::raw::c_uint = 245;
 pub const NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED: ::std::os::raw::c_uint = 246;
 pub const NS_THEME_GTK_INFO_BAR: ::std::os::raw::c_uint = 247;
 pub const NS_THEME_MAC_SOURCE_LIST: ::std::os::raw::c_uint = 248;
+pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
+pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
 pub const NS_CORNER_TOP_LEFT_X: ::std::os::raw::c_uint = 0;
 pub const NS_CORNER_TOP_LEFT_Y: ::std::os::raw::c_uint = 1;
 pub const NS_CORNER_TOP_RIGHT_X: ::std::os::raw::c_uint = 2;