Skip to content

Commit f211be5

Browse files
committed
Revert "Bug 1872780 - Remove layout.css.size-adjust.enabled pref r=webidl,emilio" for causing mass build bustages related to layout_css_size_adjust_enabled.
This reverts commit 67a6df0.
1 parent 67a6df0 commit f211be5

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

dom/webidl/FontFace.webidl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dictionary FontFaceDescriptors {
2424
UTF8String ascentOverride = "normal";
2525
UTF8String descentOverride = "normal";
2626
UTF8String lineGapOverride = "normal";
27-
UTF8String sizeAdjust = "100%";
27+
[Pref="layout.css.size-adjust.enabled"] UTF8String sizeAdjust = "100%";
2828
};
2929

3030
enum FontFaceLoadStatus { "unloaded", "loading", "loaded", "error" };

layout/style/FontFaceImpl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@ bool FontFaceImpl::SetDescriptors(const nsACString& aFamily,
489489
!setDesc(eCSSFontDesc_DescentOverride, aDescriptors.mDescentOverride) ||
490490
!setDesc(eCSSFontDesc_LineGapOverride,
491491
aDescriptors.mLineGapOverride))) ||
492-
!setDesc(eCSSFontDesc_SizeAdjust, aDescriptors.mSizeAdjust)) {
492+
(StaticPrefs::layout_css_size_adjust_enabled() &&
493+
!setDesc(eCSSFontDesc_SizeAdjust, aDescriptors.mSizeAdjust))) {
493494
// XXX Handle font-variant once we support it (bug 1055385).
494495

495496
// If any of the descriptors failed to parse, none of them should be set

modules/libpref/init/StaticPrefList.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9901,6 +9901,13 @@
99019901
mirror: always
99029902
rust: true
99039903

9904+
# Is support for the size-adjust @font-face descriptor enabled?
9905+
- name: layout.css.size-adjust.enabled
9906+
type: RelaxedAtomicBool
9907+
value: true
9908+
mirror: always
9909+
rust: true
9910+
99049911
# Is support for the tech() function in the @font-face src descriptor enabled?
99059912
- name: layout.css.font-tech.enabled
99069913
type: RelaxedAtomicBool

servo/components/style/font_face.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,9 @@ macro_rules! is_descriptor_enabled {
576576
("font-variation-settings") => {
577577
static_prefs::pref!("layout.css.font-variations.enabled")
578578
};
579+
("size-adjust") => {
580+
static_prefs::pref!("layout.css.size-adjust.enabled")
581+
};
579582
($name:tt) => {
580583
true
581584
};

0 commit comments

Comments
 (0)