Skip to content

Commit 67a6df0

Browse files
mr-cheffyemilio
authored andcommitted
Bug 1872780 - Remove layout.css.size-adjust.enabled pref r=webidl,emilio
Differential Revision: https://phabricator.services.mozilla.com/D258800
1 parent 6181a32 commit 67a6df0

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
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-
[Pref="layout.css.size-adjust.enabled"] UTF8String sizeAdjust = "100%";
27+
UTF8String sizeAdjust = "100%";
2828
};
2929

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

layout/style/FontFaceImpl.cpp

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

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

modules/libpref/init/StaticPrefList.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9901,13 +9901,6 @@
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-
99119904
# Is support for the tech() function in the @font-face src descriptor enabled?
99129905
- name: layout.css.font-tech.enabled
99139906
type: RelaxedAtomicBool

servo/components/style/font_face.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@ 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-
};
582579
($name:tt) => {
583580
true
584581
};

0 commit comments

Comments
 (0)