Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27500 - jdm:revert-wrup, r=Manishearth

Browse source 
Revert webrender upgrade

These commits revert the webrender and font-related updates from #27207. This will unbreak our FxR nightly builds while we continue to investigate the underlying crash in ANGLE. Unfortunately it also returns us to the status quo of broken canvas text rendering on UWP, but there's no way to upgrade font-kit without any of the other crates because of the underlying freetype dependency changes that happened.

Fixes #27492.
This commit is contained in:
bors-servo 2020-08-04 22:53:40 -04:00 • committed by GitHub
commit 6e28d7b3ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 134 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

184
Cargo.lock generated
View file

@ -538,7 +538,7 @@ dependencies = [
"fnv",
"font-kit",
"gfx",
"gleam 0.12.1",
"gleam 0.11.0",
"half",
"ipc-channel",
"log",
@ -718,9 +718,9 @@ dependencies = [
[[package]]
name = "cmake"
version = "0.1.44"
version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb"
checksum = "3c84c596dcf125d6781f58e3f4254677ec2a6d8aa56e8501ac277100990b3229"
dependencies = [
"cc",
]
@ -813,7 +813,7 @@ dependencies = [
"embedder_traits",
"euclid",
"gfx_traits",
"gleam 0.12.1",
"gleam 0.11.0",
"image",
"ipc-channel",
"keyboard-types",
@ -987,19 +987,6 @@ dependencies = [
"libc",
]
[[package]]
name = "core-graphics"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6082396a349fa49674ba1bda4077332a18bf150e8fa75745ece07085e29a113"
dependencies = [
"bitflags",
"core-foundation 0.9.0",
"core-graphics-types",
"foreign-types",
"libc",
]
[[package]]
name = "core-graphics-types"
version = "0.1.0"
@ -1014,12 +1001,24 @@ dependencies = [
[[package]]
name = "core-text"
version = "19.0.0"
version = "13.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2"
checksum = "db84654ad95211c082cf9795f6f83dc17d0ae6c985ac1b906369dc7384ed346d"
dependencies = [
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-foundation 0.6.4",
"core-graphics 0.17.3",
"foreign-types",
"libc",
]
[[package]]
name = "core-text"
version = "15.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "131b3fd1f8bd5db9f2b398fa4fdb6008c64afc04d447c306ac2c7e98fba2a61d"
dependencies = [
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"foreign-types",
"libc",
]
@ -1212,6 +1211,16 @@ dependencies = [
"ws",
]
[[package]]
name = "deflate"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
dependencies = [
"adler32",
"byteorder",
]
[[package]]
name = "deflate"
version = "0.8.6"
@ -1572,15 +1581,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "font-kit"
version = "0.10.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20"
checksum = "76ab2cdc792b545c49acb23aafa1cdc9381ea96140741f10bac596fd1bd1aa4f"
dependencies = [
"bitflags",
"byteorder",
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-text",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text 15.0.0",
"dirs",
"dwrote",
"float-ord",
@ -1622,23 +1631,12 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "freetype"
version = "0.7.0"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
checksum = "11926b2b410b469d0e9399eca4cbbe237a9ef02176c485803b29216307e8e028"
dependencies = [
"freetype-sys",
"libc",
]
[[package]]
name = "freetype-sys"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
dependencies = [
"cmake",
"libc",
"pkg-config",
"servo-freetype-sys",
]
[[package]]
@ -1849,9 +1847,9 @@ dependencies = [
"app_units",
"bitflags",
"byteorder",
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-text",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text 15.0.0",
"dwrote",
"euclid",
"fnv",
@ -2080,9 +2078,9 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.12.1"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdef5b9df6d3a261b80a5ac55e13bf93945725df2463c1b0a2e5a527dce0d37"
checksum = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
dependencies = [
"gl_generator 0.14.0",
]
@ -2471,13 +2469,13 @@ checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f"
[[package]]
name = "harfbuzz-sys"
version = "0.5.0"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467"
checksum = "212d74cab8498b2d15700b694fb38f77562869d05e1f8b602dd05221a1ca2d63"
dependencies = [
"cc",
"core-graphics 0.22.0",
"core-text",
"core-graphics 0.17.3",
"core-text 13.3.2",
"foreign-types",
"freetype",
"pkg-config",
@ -2722,7 +2720,7 @@ dependencies = [
"num-iter",
"num-rational 0.3.0",
"num-traits",
"png",
"png 0.16.6",
"scoped_threadpool",
"tiff",
]
@ -2748,6 +2746,15 @@ dependencies = [
"hashbrown",
]
[[package]]
name = "inflate"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff"
dependencies = [
"adler32",
]
[[package]]
name = "input_buffer"
version = "0.3.1"
@ -3191,7 +3198,7 @@ dependencies = [
"gaol",
"gfx",
"gfx_traits",
"gleam 0.12.1",
"gleam 0.11.0",
"gstreamer",
"ipc-channel",
"keyboard-types",
@ -4175,7 +4182,7 @@ dependencies = [
[[package]]
name = "peek-poke"
version = "0.2.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"euclid",
"peek-poke-derive",
@ -4184,7 +4191,7 @@ dependencies = [
[[package]]
name = "peek-poke-derive"
version = "0.2.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"proc-macro2 1.0.17",
"quote 1.0.2",
@ -4329,6 +4336,18 @@ dependencies = [
"num-traits",
]
[[package]]
name = "png"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283"
dependencies = [
"bitflags",
"crc32fast",
"deflate 0.7.20",
"inflate",
]
[[package]]
name = "png"
version = "0.16.6"
@ -4337,7 +4356,7 @@ checksum = "c150bf7479fafe3dd8740dbe48cc33b2a3efb7b0fe3483aced8bbc39f6d0238d"
dependencies = [
"bitflags",
"crc32fast",
"deflate",
"deflate 0.8.6",
"miniz_oxide 0.3.7",
]
@ -4547,14 +4566,15 @@ checksum = "a871f1e45a3a3f0c73fb60343c811238bb5143a81642e27c2ac7aac27ff01a63"
[[package]]
name = "raqote"
version = "0.8.1-alpha.0"
source = "git+https://github.com/jdm/raqote?branch=fkup#ff5d2d1aa7813dbcacb0d028cf7d17c82a35d9d4"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501c19caa439857ed7bea975fa4c3c10ee9a24e33c2640030c3ac14b58f39f77"
dependencies = [
"euclid",
"font-kit",
"lyon_geom 0.15.0",
"pathfinder_geometry",
"png",
"png 0.15.3",
"sw-composite",
"typed-arena",
]
@ -5110,9 +5130,9 @@ dependencies = [
[[package]]
name = "servo-fontconfig"
version = "0.5.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b47fef69c52fb55838c756949c60595f0b855daa4e82fc52ad99ff3e03e2c70"
checksum = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9"
dependencies = [
"libc",
"servo-fontconfig-sys",
@ -5120,12 +5140,22 @@ dependencies = [
[[package]]
name = "servo-fontconfig-sys"
version = "5.1.0"
version = "4.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
checksum = "62b3e166450f523f4db06c14f02a2d39e76d49b5d8cbd224338d93e3595c156c"
dependencies = [
"expat-sys",
"freetype-sys",
"pkg-config",
"servo-freetype-sys",
]
[[package]]
name = "servo-freetype-sys"
version = "4.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c4ccb6d0d32d277d3ef7dea86203d8210945eb7a45fba89dd445b3595dd0dfc"
dependencies = [
"cmake",
"pkg-config",
]
@ -6436,9 +6466,12 @@ dependencies = [
[[package]]
name = "unicode-script"
version = "0.5.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79bf4d5fc96546fdb73f9827097810bbda93b11a6770ff3a54e1f445d4135787"
checksum = "09f03ad95feb4fde244d79985bfd79eb34ff2702fedb441d2ba3f4ff813efd19"
dependencies = [
"harfbuzz-sys",
]
[[package]]
name = "unicode-segmentation"
@ -6786,23 +6819,24 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.61.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"backtrace",
"base64 0.10.1",
"bincode",
"bitflags",
"build-parallel",
"byteorder",
"cfg-if",
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-text",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"core-text 15.0.0",
"cstr",
"dwrote",
"euclid",
"freetype",
"fxhash",
"gleam 0.12.1",
"gleam 0.11.0",
"glslopt",
"image",
"lazy_static",
@ -6815,11 +6849,11 @@ dependencies = [
"ron",
"serde",
"serde_json",
"sig",
"smallvec 1.4.1",
"svg_fmt",
"time",
"tracy-rs",
"uuid",
"webrender_api",
"webrender_build",
"wr_malloc_size_of",
@ -6829,13 +6863,13 @@ dependencies = [
[[package]]
name = "webrender_api"
version = "0.61.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"app_units",
"bitflags",
"byteorder",
"core-foundation 0.9.0",
"core-graphics 0.22.0",
"core-foundation 0.7.0",
"core-graphics 0.19.0",
"derive_more",
"euclid",
"malloc_size_of_derive",
@ -6850,7 +6884,7 @@ dependencies = [
[[package]]
name = "webrender_build"
version = "0.0.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"bitflags",
"lazy_static",
@ -7029,7 +7063,7 @@ dependencies = [
[[package]]
name = "wr_malloc_size_of"
version = "0.0.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40"
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [
"app_units",
"euclid",

6
Cargo.toml
View file

@ -32,5 +32,7 @@ mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" }
# https://github.com/rust-lang/backtrace-rs/pull/363/
backtrace = { git = "https://github.com/servo/backtrace-rs", branch = "uwp-fix" }
[patch."https://github.com/jrmuizel/raqote"]
raqote = { git = "https://github.com/jdm/raqote", branch = "fkup" }
# https://github.com/servo/servo/issues/27039#issuecomment-654400150
[patch."https://github.com/servo/webrender"]
webrender = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }
webrender_api = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }

6
components/canvas/Cargo.toml
View file

@ -22,17 +22,17 @@ canvas_traits = { path = "../canvas_traits" }
crossbeam-channel = "0.4"
cssparser = "0.27"
euclid = "0.20"
font-kit = "0.10"
font-kit = "0.7"
fnv = "1.0"
gfx = { path = "../gfx" }
gleam = "0.12"
gleam = "0.11"
half = "1"
ipc-channel = "0.14"
log = "0.4"
lyon_geom = "0.14"
num-traits = "0.2"
pixels = { path = "../pixels" }
raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] }
raqote = { version = "0.8", features = ["text"] }
servo_arc = { path = "../servo_arc" }
servo_config = { path = "../config" }
sparkle = "0.1.25"

2
components/compositing/Cargo.toml
View file

@ -21,7 +21,7 @@ crossbeam-channel = "0.4"
embedder_traits = { path = "../embedder_traits" }
euclid = "0.20"
gfx_traits = { path = "../gfx_traits" }
gleam = { version = "0.12", optional = true }
gleam = { version = "0.11", optional = true }
image = "0.23"
ipc-channel = "0.14"
keyboard-types = "0.5"

14
components/gfx/Cargo.toml
View file

@ -20,7 +20,7 @@ euclid = "0.20"
fnv = "1.0"
fontsan = { git = "https://github.com/servo/fontsan" }
gfx_traits = { path = "../gfx_traits" }
harfbuzz-sys = "0.5"
harfbuzz-sys = "0.3"
ipc-channel = "0.14"
lazy_static = "1"
libc = "0.2"
@ -37,22 +37,22 @@ style = { path = "../style", features = ["servo"] }
time = "0.1.12"
ucd = "0.1.1"
unicode-bidi = { version = "0.3", features = ["with_serde"] }
unicode-script = "0.5"
unicode-script = { version = "0.3", features = ["harfbuzz"] }
webrender_api = { git = "https://github.com/servo/webrender" }
xi-unicode = "0.1.0"
[target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0"
core-foundation = "0.9"
core-graphics = "0.22"
core-text = "19.0"
core-foundation = "0.7"
core-graphics = "0.19"
core-text = "15.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.7"
freetype = "0.4"
servo_allocator = { path = "../allocator" }
[target.'cfg(target_os = "linux")'.dependencies]
servo-fontconfig = "0.5"
servo-fontconfig = "0.4"
[target.'cfg(target_os = "android")'.dependencies]
xml-rs = "0.8"

167
components/gfx/text/shaping/harfbuzz.rs
View file

@ -191,171 +191,6 @@ impl Shaper {
}
}
pub fn unicode_to_hb_script(script: unicode_script::Script) -> harfbuzz_sys::hb_script_t {
use harfbuzz_sys::*;
use unicode_script::Script::*;
match script {
Adlam => HB_SCRIPT_ADLAM,
Ahom => HB_SCRIPT_AHOM,
Anatolian_Hieroglyphs => HB_SCRIPT_ANATOLIAN_HIEROGLYPHS,
Arabic => HB_SCRIPT_ARABIC,
Armenian => HB_SCRIPT_ARMENIAN,
Avestan => HB_SCRIPT_AVESTAN,
Balinese => HB_SCRIPT_BALINESE,
Bamum => HB_SCRIPT_BAMUM,
Bassa_Vah => HB_SCRIPT_BASSA_VAH,
Batak => HB_SCRIPT_BATAK,
Bengali => HB_SCRIPT_BENGALI,
Bhaiksuki => HB_SCRIPT_BHAIKSUKI,
Bopomofo => HB_SCRIPT_BOPOMOFO,
Brahmi => HB_SCRIPT_BRAHMI,
Braille => HB_SCRIPT_BRAILLE,
Buginese => HB_SCRIPT_BUGINESE,
Buhid => HB_SCRIPT_BUHID,
Canadian_Aboriginal => HB_SCRIPT_CANADIAN_SYLLABICS,
Carian => HB_SCRIPT_CARIAN,
Caucasian_Albanian => HB_SCRIPT_CAUCASIAN_ALBANIAN,
Chakma => HB_SCRIPT_CHAKMA,
Cham => HB_SCRIPT_CHAM,
Cherokee => HB_SCRIPT_CHEROKEE,
Chorasmian => HB_SCRIPT_CHORASMIAN,
Common => HB_SCRIPT_COMMON,
Coptic => HB_SCRIPT_COPTIC,
Cuneiform => HB_SCRIPT_CUNEIFORM,
Cypriot => HB_SCRIPT_CYPRIOT,
Cyrillic => HB_SCRIPT_CYRILLIC,
Deseret => HB_SCRIPT_DESERET,
Devanagari => HB_SCRIPT_DEVANAGARI,
Dives_Akuru => HB_SCRIPT_DIVES_AKURU,
Dogra => HB_SCRIPT_DOGRA,
Duployan => HB_SCRIPT_DUPLOYAN,
Egyptian_Hieroglyphs => HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,
Elbasan => HB_SCRIPT_ELBASAN,
Elymaic => HB_SCRIPT_ELYMAIC,
Ethiopic => HB_SCRIPT_ETHIOPIC,
Georgian => HB_SCRIPT_GEORGIAN,
Glagolitic => HB_SCRIPT_GLAGOLITIC,
Gothic => HB_SCRIPT_GOTHIC,
Grantha => HB_SCRIPT_GRANTHA,
Greek => HB_SCRIPT_GREEK,
Gujarati => HB_SCRIPT_GUJARATI,
Gunjala_Gondi => HB_SCRIPT_GUNJALA_GONDI,
Gurmukhi => HB_SCRIPT_GURMUKHI,
Han => HB_SCRIPT_HAN,
Hangul => HB_SCRIPT_HANGUL,
Hanifi_Rohingya => HB_SCRIPT_HANIFI_ROHINGYA,
Hanunoo => HB_SCRIPT_HANUNOO,
Hatran => HB_SCRIPT_HATRAN,
Hebrew => HB_SCRIPT_HEBREW,
Hiragana => HB_SCRIPT_HIRAGANA,
Imperial_Aramaic => HB_SCRIPT_IMPERIAL_ARAMAIC,
Inherited => HB_SCRIPT_INHERITED,
Inscriptional_Pahlavi => HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,
Inscriptional_Parthian => HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,
Javanese => HB_SCRIPT_JAVANESE,
Kaithi => HB_SCRIPT_KAITHI,
Kannada => HB_SCRIPT_KANNADA,
Katakana => HB_SCRIPT_KATAKANA,
Kayah_Li => HB_SCRIPT_KAYAH_LI,
Kharoshthi => HB_SCRIPT_KHAROSHTHI,
Khitan_Small_Script => HB_SCRIPT_KHITAN_SMALL_SCRIPT,
Khmer => HB_SCRIPT_KHMER,
Khojki => HB_SCRIPT_KHOJKI,
Khudawadi => HB_SCRIPT_KHUDAWADI,
Lao => HB_SCRIPT_LAO,
Latin => HB_SCRIPT_LATIN,
Lepcha => HB_SCRIPT_LEPCHA,
Limbu => HB_SCRIPT_LIMBU,
Linear_A => HB_SCRIPT_LINEAR_A,
Linear_B => HB_SCRIPT_LINEAR_B,
Lisu => HB_SCRIPT_LISU,
Lycian => HB_SCRIPT_LYCIAN,
Lydian => HB_SCRIPT_LYDIAN,
Mahajani => HB_SCRIPT_MAHAJANI,
Makasar => HB_SCRIPT_MAKASAR,
Malayalam => HB_SCRIPT_MALAYALAM,
Mandaic => HB_SCRIPT_MANDAIC,
Manichaean => HB_SCRIPT_MANICHAEAN,
Marchen => HB_SCRIPT_MARCHEN,
Masaram_Gondi => HB_SCRIPT_MASARAM_GONDI,
Medefaidrin => HB_SCRIPT_MEDEFAIDRIN,
Meetei_Mayek => HB_SCRIPT_MEETEI_MAYEK,
Mende_Kikakui => HB_SCRIPT_MENDE_KIKAKUI,
Meroitic_Cursive => HB_SCRIPT_MEROITIC_CURSIVE,
Meroitic_Hieroglyphs => HB_SCRIPT_MEROITIC_HIEROGLYPHS,
Miao => HB_SCRIPT_MIAO,
Modi => HB_SCRIPT_MODI,
Mongolian => HB_SCRIPT_MONGOLIAN,
Mro => HB_SCRIPT_MRO,
Multani => HB_SCRIPT_MULTANI,
Myanmar => HB_SCRIPT_MYANMAR,
Nabataean => HB_SCRIPT_NABATAEAN,
Nandinagari => HB_SCRIPT_NANDINAGARI,
New_Tai_Lue => HB_SCRIPT_NEW_TAI_LUE,
Newa => HB_SCRIPT_NEWA,
Nko => HB_SCRIPT_NKO,
Nushu => HB_SCRIPT_NUSHU,
Nyiakeng_Puachue_Hmong => HB_SCRIPT_NYIAKENG_PUACHUE_HMONG,
Ogham => HB_SCRIPT_OGHAM,
Ol_Chiki => HB_SCRIPT_OL_CHIKI,
Old_Hungarian => HB_SCRIPT_OLD_HUNGARIAN,
Old_Italic => HB_SCRIPT_OLD_ITALIC,
Old_North_Arabian => HB_SCRIPT_OLD_NORTH_ARABIAN,
Old_Permic => HB_SCRIPT_OLD_PERMIC,
Old_Persian => HB_SCRIPT_OLD_PERSIAN,
Old_Sogdian => HB_SCRIPT_OLD_SOGDIAN,
Old_South_Arabian => HB_SCRIPT_OLD_SOUTH_ARABIAN,
Old_Turkic => HB_SCRIPT_OLD_TURKIC,
Oriya => HB_SCRIPT_ORIYA,
Osage => HB_SCRIPT_OSAGE,
Osmanya => HB_SCRIPT_OSMANYA,
Pahawh_Hmong => HB_SCRIPT_PAHAWH_HMONG,
Palmyrene => HB_SCRIPT_PALMYRENE,
Pau_Cin_Hau => HB_SCRIPT_PAU_CIN_HAU,
Phags_Pa => HB_SCRIPT_PHAGS_PA,
Phoenician => HB_SCRIPT_PHOENICIAN,
Psalter_Pahlavi => HB_SCRIPT_PSALTER_PAHLAVI,
Rejang => HB_SCRIPT_REJANG,
Runic => HB_SCRIPT_RUNIC,
Samaritan => HB_SCRIPT_SAMARITAN,
Saurashtra => HB_SCRIPT_SAURASHTRA,
Sharada => HB_SCRIPT_SHARADA,
Shavian => HB_SCRIPT_SHAVIAN,
Siddham => HB_SCRIPT_SIDDHAM,
SignWriting => HB_SCRIPT_SIGNWRITING,
Sinhala => HB_SCRIPT_SINHALA,
Sogdian => HB_SCRIPT_SOGDIAN,
Sora_Sompeng => HB_SCRIPT_SORA_SOMPENG,
Soyombo => HB_SCRIPT_SOYOMBO,
Sundanese => HB_SCRIPT_SUNDANESE,
Syloti_Nagri => HB_SCRIPT_SYLOTI_NAGRI,
Syriac => HB_SCRIPT_SYRIAC,
Tagalog => HB_SCRIPT_TAGALOG,
Tagbanwa => HB_SCRIPT_TAGBANWA,
Tai_Le => HB_SCRIPT_TAI_LE,
Tai_Tham => HB_SCRIPT_TAI_THAM,
Tai_Viet => HB_SCRIPT_TAI_VIET,
Takri => HB_SCRIPT_TAKRI,
Tamil => HB_SCRIPT_TAMIL,
Tangut => HB_SCRIPT_TANGUT,
Telugu => HB_SCRIPT_TELUGU,
Thaana => HB_SCRIPT_THAANA,
Thai => HB_SCRIPT_THAI,
Tibetan => HB_SCRIPT_TIBETAN,
Tifinagh => HB_SCRIPT_TIFINAGH,
Tirhuta => HB_SCRIPT_TIRHUTA,
Ugaritic => HB_SCRIPT_UGARITIC,
Unknown => HB_SCRIPT_UNKNOWN,
Vai => HB_SCRIPT_VAI,
Warang_Citi => HB_SCRIPT_WARANG_CITI,
Wancho => HB_SCRIPT_WANCHO,
Yezidi => HB_SCRIPT_YEZIDI,
Yi => HB_SCRIPT_YI,
Zanabazar_Square => HB_SCRIPT_ZANABAZAR_SQUARE,
_ => HB_SCRIPT_UNKNOWN,
}
}
impl ShaperMethods for Shaper {
/// Calculate the layout metrics associated with the given text when painted in a specific
/// font.
@ -371,7 +206,7 @@ impl ShaperMethods for Shaper {
},
);
hb_buffer_set_script(hb_buffer, unicode_to_hb_script(options.script));
hb_buffer_set_script(hb_buffer, options.script.to_hb_script());
hb_buffer_add_utf8(
hb_buffer,

2
components/layout/Cargo.toml
View file

@ -48,7 +48,7 @@ smallvec = { version = "0.6", features = ["std", "union"] }
style = { path = "../style", features = ["servo", "servo-layout-2013"] }
style_traits = { path = "../style_traits" }
unicode-bidi = { version = "0.3", features = ["with_serde"] }
unicode-script = "0.5"
unicode-script = { version = "0.3", features = ["harfbuzz"] }
webrender_api = { git = "https://github.com/servo/webrender" }
xi-unicode = "0.1.0"

4
components/layout/text.rs
View file

@ -29,7 +29,7 @@ use style::properties::ComputedValues;
use style::values::generics::text::LineHeight;
use style::values::specified::text::{TextTransform, TextTransformCase};
use unicode_bidi as bidi;
use unicode_script::Script;
use unicode_script::{get_script, Script};
use xi_unicode::LineBreakLeafIter;
/// Returns the concatenated text of a list of unscanned text fragments.
@ -259,7 +259,7 @@ impl TextRunScanner {
//
// TODO: Special handling of paired punctuation characters.
// http://www.unicode.org/reports/tr24/#Common
let script = Script::from(character);
let script = get_script(character);
let compatible_script = is_compatible(script, run_info.script);
if compatible_script && !is_specific(run_info.script) && is_specific(script)
{

2
components/layout_2020/Cargo.toml
View file

@ -42,7 +42,7 @@ servo_arc = { path = "../servo_arc" }
servo_url = { path = "../url" }
style = { path = "../style", features = ["servo", "servo-layout-2020"] }
style_traits = { path = "../style_traits" }
unicode-script = "0.5"
unicode-script = { version = "0.3", features = ["harfbuzz"] }
webrender_api = { git = "https://github.com/servo/webrender" }
[dev-dependencies]

2
components/servo/Cargo.toml
View file

@ -54,7 +54,7 @@ env_logger = "0.7"
euclid = "0.20"
gfx = { path = "../gfx" }
gfx_traits = { path = "../gfx_traits" }
gleam = "0.12"
gleam = "0.11"
gstreamer = { version = "0.15", features = ["v1_16"], optional = true }
ipc-channel = "0.14"
keyboard-types = "0.5"

3
servo-tidy.toml
View file

@ -32,6 +32,7 @@ packages = [
"arrayvec",
"base64",
"cocoa",
"deflate",
"gleam",
"libloading",
"metal",
@ -39,6 +40,7 @@ packages = [
"num-rational",
"parking_lot",
"parking_lot_core",
"png",
"wayland-sys",
# https://github.com/servo/servo/issues/26933
@ -63,6 +65,7 @@ packages = [
"core-foundation",
"core-foundation-sys",
"core-graphics",
"core-text",
"lyon_geom",
]
# Files that are ignored for all tidy and lint checks.

3
tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
View file

@ -1,4 +1,3 @@
[background-image-tiled.https.html]
type: reftest
expected: CRASH
bug: https://github.com/servo/servo/issues/27467
expected: FAIL