From b3dc5c6958f64dcf1a886f293852726d3d0b9d37 Mon Sep 17 00:00:00 2001 From: Rhea-Eve <132553576+Rhea-Eve@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:52:06 -0400 Subject: [PATCH] Attempt using version of Stylo with -x-lang enabled (#31737) * Attempt using version of Stylo with -x-lang enabled Signed-off-by: Rhea Karty * Added x-lang to initializer list to address failing tests. Signed-off-by: Rhea Karty * Fix formatting (sorry) Signed-off-by: Rhea Karty * Revert changes in Cargo.toml, update Cargo.lock. Signed-off-by: Rhea Karty * Removed .git suffix from Stylo Signed-off-by: Rhea Karty --------- Signed-off-by: Rhea Karty --- Cargo.lock | 26 +++++++++++++------------- components/gfx/tests/font_context.rs | 3 ++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e56959b7ba..044f6438af3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1211,7 +1211,7 @@ dependencies = [ [[package]] name = "derive_common" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "darling", "proc-macro2", @@ -3464,7 +3464,7 @@ dependencies = [ [[package]] name = "malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "accountable-refcell", "app_units", @@ -5075,7 +5075,7 @@ dependencies = [ [[package]] name = "selectors" version = "0.24.0" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "bitflags 1.3.2", "cssparser", @@ -5363,7 +5363,7 @@ dependencies = [ [[package]] name = "servo_arc" version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "nodrop", "serde", @@ -5373,7 +5373,7 @@ dependencies = [ [[package]] name = "servo_atoms" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "string_cache", "string_cache_codegen", @@ -5579,7 +5579,7 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "size_of_test" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "static_assertions", ] @@ -5705,7 +5705,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "static_prefs" version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" [[package]] name = "str-buf" @@ -5748,7 +5748,7 @@ dependencies = [ [[package]] name = "style" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "app_units", "arrayvec", @@ -5807,7 +5807,7 @@ dependencies = [ [[package]] name = "style_config" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "lazy_static", ] @@ -5815,7 +5815,7 @@ dependencies = [ [[package]] name = "style_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "darling", "derive_common", @@ -5846,7 +5846,7 @@ dependencies = [ [[package]] name = "style_traits" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "app_units", "bitflags 1.3.2", @@ -6189,7 +6189,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "to_shmem" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "cssparser", "servo_arc", @@ -6202,7 +6202,7 @@ dependencies = [ [[package]] name = "to_shmem_derive" version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2023-09-01#3d41c54f18ace2bc3708fe3b5c032c5341a331ed" +source = "git+https://github.com/servo/stylo?branch=2023-09-01#bcdebc41b2a2222e9fa5ae6d7d1572025c32dc47" dependencies = [ "darling", "derive_common", diff --git a/components/gfx/tests/font_context.rs b/components/gfx/tests/font_context.rs index 088d61b4d3f..bf4bcf2c58a 100644 --- a/components/gfx/tests/font_context.rs +++ b/components/gfx/tests/font_context.rs @@ -25,7 +25,7 @@ use style::values::computed::font::{ FamilyName, FontFamily, FontFamilyList, FontFamilyNameSyntax, FontSize, FontStretch, FontStyle, FontWeight, SingleFontFamily, }; -use style::values::computed::FontLanguageOverride; +use style::values::computed::{FontLanguageOverride, XLang}; use webrender_api::{FontInstanceKey, FontKey, IdNamespace}; struct TestFontSource { @@ -112,6 +112,7 @@ fn style() -> FontStyleStruct { font_stretch: FontStretch::hundred(), hash: 0, font_language_override: FontLanguageOverride::normal(), + _x_lang: XLang::get_initial_value(), }; style.compute_font_hash(); style