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

Revert "Update webrender."

Browse source 
This reverts commit 2ca1b06e77.
This commit is contained in:
Josh Matthews 2020-08-04 19:15:52 -04:00
parent 549179bbd6
commit c1920357b0
8 changed files with 73 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

87
Cargo.lock generated
View file

@ -538,7 +538,7 @@ dependencies = [
"fnv", "fnv",
"font-kit", "font-kit",
"gfx", "gfx",
"gleam 0.12.1", "gleam 0.11.0",
"half", "half",
"ipc-channel", "ipc-channel",
"log", "log",
@ -813,7 +813,7 @@ dependencies = [
"embedder_traits", "embedder_traits",
"euclid", "euclid",
"gfx_traits", "gfx_traits",
"gleam 0.12.1", "gleam 0.11.0",
"image", "image",
"ipc-channel", "ipc-channel",
"keyboard-types", "keyboard-types",
@ -1012,6 +1012,18 @@ dependencies = [
"libc", "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",
]
[[package]] [[package]]
name = "core-text" name = "core-text"
version = "19.0.0" version = "19.0.0"
@ -1580,11 +1592,11 @@ dependencies = [
"byteorder", "byteorder",
"core-foundation 0.9.0", "core-foundation 0.9.0",
"core-graphics 0.22.0", "core-graphics 0.22.0",
"core-text", "core-text 19.0.0",
"dirs", "dirs",
"dwrote", "dwrote",
"float-ord", "float-ord",
"freetype", "freetype 0.7.0",
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
@ -1620,6 +1632,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "freetype"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11926b2b410b469d0e9399eca4cbbe237a9ef02176c485803b29216307e8e028"
dependencies = [
"libc",
"servo-freetype-sys",
]
[[package]] [[package]]
name = "freetype" name = "freetype"
version = "0.7.0" version = "0.7.0"
@ -1849,14 +1871,14 @@ dependencies = [
"app_units", "app_units",
"bitflags", "bitflags",
"byteorder", "byteorder",
"core-foundation 0.9.0", "core-foundation 0.7.0",
"core-graphics 0.22.0", "core-graphics 0.19.0",
"core-text", "core-text 15.0.0",
"dwrote", "dwrote",
"euclid", "euclid",
"fnv", "fnv",
"fontsan", "fontsan",
"freetype", "freetype 0.7.0",
"gfx_traits", "gfx_traits",
"harfbuzz-sys", "harfbuzz-sys",
"ipc-channel", "ipc-channel",
@ -2080,9 +2102,9 @@ dependencies = [
[[package]] [[package]]
name = "gleam" name = "gleam"
version = "0.12.1" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdef5b9df6d3a261b80a5ac55e13bf93945725df2463c1b0a2e5a527dce0d37" checksum = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
dependencies = [ dependencies = [
"gl_generator 0.14.0", "gl_generator 0.14.0",
] ]
@ -2477,9 +2499,9 @@ checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467"
dependencies = [ dependencies = [
"cc", "cc",
"core-graphics 0.22.0", "core-graphics 0.22.0",
"core-text", "core-text 19.0.0",
"foreign-types", "foreign-types",
"freetype", "freetype 0.7.0",
"pkg-config", "pkg-config",
] ]
@ -3191,7 +3213,7 @@ dependencies = [
"gaol", "gaol",
"gfx", "gfx",
"gfx_traits", "gfx_traits",
"gleam 0.12.1", "gleam 0.11.0",
"gstreamer", "gstreamer",
"ipc-channel", "ipc-channel",
"keyboard-types", "keyboard-types",
@ -4175,7 +4197,7 @@ dependencies = [
[[package]] [[package]]
name = "peek-poke" name = "peek-poke"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"euclid", "euclid",
"peek-poke-derive", "peek-poke-derive",
@ -4184,7 +4206,7 @@ dependencies = [
[[package]] [[package]]
name = "peek-poke-derive" name = "peek-poke-derive"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"proc-macro2 1.0.17", "proc-macro2 1.0.17",
"quote 1.0.2", "quote 1.0.2",
@ -5129,6 +5151,16 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "servo-freetype-sys"
version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b"
dependencies = [
"cmake",
"pkg-config",
]
[[package]] [[package]]
name = "servo-gst-plugin" name = "servo-gst-plugin"
version = "0.0.1" version = "0.0.1"
@ -6786,23 +6818,24 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.61.0" version = "0.61.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"backtrace",
"base64 0.10.1", "base64 0.10.1",
"bincode", "bincode",
"bitflags", "bitflags",
"build-parallel", "build-parallel",
"byteorder", "byteorder",
"cfg-if", "cfg-if",
"core-foundation 0.9.0", "core-foundation 0.7.0",
"core-graphics 0.22.0", "core-graphics 0.19.0",
"core-text", "core-text 15.0.0",
"cstr", "cstr",
"dwrote", "dwrote",
"euclid", "euclid",
"freetype", "freetype 0.4.1",
"fxhash", "fxhash",
"gleam 0.12.1", "gleam 0.11.0",
"glslopt", "glslopt",
"image", "image",
"lazy_static", "lazy_static",
@ -6815,11 +6848,11 @@ dependencies = [
"ron", "ron",
"serde", "serde",
"serde_json", "serde_json",
"sig",
"smallvec 1.4.1", "smallvec 1.4.1",
"svg_fmt", "svg_fmt",
"time", "time",
"tracy-rs", "tracy-rs",
"uuid",
"webrender_api", "webrender_api",
"webrender_build", "webrender_build",
"wr_malloc_size_of", "wr_malloc_size_of",
@ -6829,13 +6862,13 @@ dependencies = [
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.61.0" version = "0.61.0"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"app_units", "app_units",
"bitflags", "bitflags",
"byteorder", "byteorder",
"core-foundation 0.9.0", "core-foundation 0.7.0",
"core-graphics 0.22.0", "core-graphics 0.19.0",
"derive_more", "derive_more",
"euclid", "euclid",
"malloc_size_of_derive", "malloc_size_of_derive",
@ -6850,7 +6883,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_build" name = "webrender_build"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"lazy_static", "lazy_static",
@ -7029,7 +7062,7 @@ dependencies = [
[[package]] [[package]]
name = "wr_malloc_size_of" name = "wr_malloc_size_of"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
dependencies = [ dependencies = [
"app_units", "app_units",
"euclid", "euclid",

5
Cargo.toml
View file

@ -34,3 +34,8 @@ backtrace = { git = "https://github.com/servo/backtrace-rs", branch = "uwp-fix"
[patch."https://github.com/jrmuizel/raqote"] [patch."https://github.com/jrmuizel/raqote"]
raqote = { git = "https://github.com/jdm/raqote", branch = "fkup" } 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" }

2
components/canvas/Cargo.toml
View file

@ -25,7 +25,7 @@ euclid = "0.20"
font-kit = "0.10" font-kit = "0.10"
fnv = "1.0" fnv = "1.0"
gfx = { path = "../gfx" } gfx = { path = "../gfx" }
gleam = "0.12" gleam = "0.11"
half = "1" half = "1"
ipc-channel = "0.14" ipc-channel = "0.14"
log = "0.4" log = "0.4"

2
components/compositing/Cargo.toml
View file

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

6
components/gfx/Cargo.toml
View file

@ -43,9 +43,9 @@ xi-unicode = "0.1.0"
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
byteorder = "1.0" byteorder = "1.0"
core-foundation = "0.9" core-foundation = "0.7"
core-graphics = "0.22" core-graphics = "0.19"
core-text = "19.0" core-text = "15.0"
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
freetype = "0.7" freetype = "0.7"

2
components/servo/Cargo.toml
View file

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

1
servo-tidy.toml
View file

@ -32,6 +32,7 @@ packages = [
"arrayvec", "arrayvec",
"base64", "base64",
"cocoa", "cocoa",
"freetype",
"gleam", "gleam",
"libloading", "libloading",
"metal", "metal",

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] [background-image-tiled.https.html]
type: reftest type: reftest
expected: CRASH expected: FAIL
bug: https://github.com/servo/servo/issues/27467