Skip to content

Commit 7d10efe

Browse files
declantsiennicoburns
authored andcommitted
fix swash emoji
1 parent 3580588 commit 7d10efe

File tree

5 files changed

+150
-50
lines changed

5 files changed

+150
-50
lines changed

Cargo.lock

Lines changed: 136 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webrender/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build = "build.rs"
99
edition = "2018"
1010

1111
[features]
12-
default = ["font_backend_native", "static_freetype"]
12+
default = ["font_backend_swash"]
1313
profiler = ["tracy-rs/enable_profiler"]
1414
capture = ["api/serialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/capture"]
1515
replay = ["api/deserialize", "ron", "serde", "smallvec/serde", "etagere/serialization", "glyph_rasterizer/replay"]

webrender_api/src/font.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl FontSize {
5555
#[derive(Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
5656
pub struct NativeFontHandle(pub u32);
5757

58-
#[cfg(not(any(feature = "font_backend_swash", target_os = "macos", target_os = "ios")]
58+
#[cfg(not(any(feature = "font_backend_swash", target_os = "macos", target_os = "ios")))]
5959
#[derive(Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
6060
pub struct NativeFontHandle {
6161
pub path: std::path::PathBuf,

wr_glyph_rasterizer/Cargo.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MPL-2.0"
77
edition = "2018"
88

99
[features]
10-
default = ["backend_native", "static_freetype"]
10+
default = ["backend_swash"]
1111
dynamic_freetype = []
1212
static_freetype = ["freetype/freetype-sys"]
1313
capture = ["api/serialize", "serde", "smallvec/serde"]
@@ -34,9 +34,16 @@ glean = { workspace = true, optional = true }
3434
firefox-on-glean = { version = "0.1.0", optional = true }
3535
serde = { optional = true, version = "1.0", features = ["serde_derive"] }
3636
parking_lot = { version = "0.12", optional = true }
37-
swash = { version = "0.1", optional = true }
3837
zeno = { version = "0.2.2", optional = true }
39-
font-index = { version = "0.1", optional = true }
38+
39+
[dependencies.swash]
40+
git = "https://github.com/declantsien/swash.git"
41+
branch = "webrender-fix"
42+
optional = true
43+
44+
[dependencies.font-index]
45+
git = "https://github.com/declantsien/font-index.git"
46+
optional = true
4047

4148
[dev-dependencies]
4249
env_logger = { version = "0.10", default-features = false }

0 commit comments

Comments
 (0)