mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Update webrender.
This commit is contained in:
Josh Matthews
parent
420e19f172
commit
91ca74c9be
7 changed files with 33 additions and 66 deletions
84
Cargo.lock
generated
84
Cargo.lock
generated
|
|
@ -547,7 +547,7 @@ dependencies = [
|
|||
"fnv",
|
||||
"font-kit",
|
||||
"gfx",
|
||||
"gleam 0.11.0",
|
||||
"gleam 0.12.1",
|
||||
"half",
|
||||
"ipc-channel",
|
||||
"log",
|
||||
|
|
@ -822,7 +822,7 @@ dependencies = [
|
|||
"embedder_traits",
|
||||
"euclid",
|
||||
"gfx_traits",
|
||||
"gleam 0.11.0",
|
||||
"gleam 0.12.1",
|
||||
"image",
|
||||
"ipc-channel",
|
||||
"keyboard-types",
|
||||
|
|
@ -1020,18 +1020,6 @@ dependencies = [
|
|||
"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]]
|
||||
name = "core-text"
|
||||
version = "19.0.0"
|
||||
|
|
@ -1606,11 +1594,11 @@ dependencies = [
|
|||
"byteorder",
|
||||
"core-foundation 0.9.0",
|
||||
"core-graphics 0.22.0",
|
||||
"core-text 19.0.0",
|
||||
"core-text",
|
||||
"dirs",
|
||||
"dwrote",
|
||||
"float-ord",
|
||||
"freetype 0.7.0",
|
||||
"freetype",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"log",
|
||||
|
|
@ -1646,16 +1634,6 @@ version = "0.1.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
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]]
|
||||
name = "freetype"
|
||||
version = "0.7.0"
|
||||
|
|
@ -1895,14 +1873,14 @@ dependencies = [
|
|||
"app_units",
|
||||
"bitflags",
|
||||
"byteorder",
|
||||
"core-foundation 0.7.0",
|
||||
"core-graphics 0.19.0",
|
||||
"core-text 15.0.0",
|
||||
"core-foundation 0.9.0",
|
||||
"core-graphics 0.22.0",
|
||||
"core-text",
|
||||
"dwrote",
|
||||
"euclid",
|
||||
"fnv",
|
||||
"fontsan",
|
||||
"freetype 0.7.0",
|
||||
"freetype",
|
||||
"gfx_traits",
|
||||
"harfbuzz-sys",
|
||||
"ipc-channel",
|
||||
|
|
@ -2126,9 +2104,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gleam"
|
||||
version = "0.11.0"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
|
||||
checksum = "3fdef5b9df6d3a261b80a5ac55e13bf93945725df2463c1b0a2e5a527dce0d37"
|
||||
dependencies = [
|
||||
"gl_generator 0.14.0",
|
||||
]
|
||||
|
|
@ -2523,9 +2501,9 @@ checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467"
|
|||
dependencies = [
|
||||
"cc",
|
||||
"core-graphics 0.22.0",
|
||||
"core-text 19.0.0",
|
||||
"core-text",
|
||||
"foreign-types",
|
||||
"freetype 0.7.0",
|
||||
"freetype",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
|
|
@ -3236,7 +3214,7 @@ dependencies = [
|
|||
"gaol",
|
||||
"gfx",
|
||||
"gfx_traits",
|
||||
"gleam 0.11.0",
|
||||
"gleam 0.12.1",
|
||||
"gstreamer",
|
||||
"ipc-channel",
|
||||
"keyboard-types",
|
||||
|
|
@ -4226,7 +4204,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "peek-poke"
|
||||
version = "0.2.0"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"euclid",
|
||||
"peek-poke-derive",
|
||||
|
|
@ -4235,7 +4213,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "peek-poke-derive"
|
||||
version = "0.2.1"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.17",
|
||||
"quote 1.0.2",
|
||||
|
|
@ -5180,16 +5158,6 @@ dependencies = [
|
|||
"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]]
|
||||
name = "servo-gst-plugin"
|
||||
version = "0.0.1"
|
||||
|
|
@ -6860,7 +6828,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender"
|
||||
version = "0.61.0"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"base64 0.10.1",
|
||||
|
|
@ -6869,15 +6837,15 @@ dependencies = [
|
|||
"build-parallel",
|
||||
"byteorder",
|
||||
"cfg-if",
|
||||
"core-foundation 0.7.0",
|
||||
"core-graphics 0.19.0",
|
||||
"core-text 15.0.0",
|
||||
"core-foundation 0.9.0",
|
||||
"core-graphics 0.22.0",
|
||||
"core-text",
|
||||
"cstr",
|
||||
"dwrote",
|
||||
"euclid",
|
||||
"freetype 0.4.1",
|
||||
"freetype",
|
||||
"fxhash",
|
||||
"gleam 0.11.0",
|
||||
"gleam 0.12.1",
|
||||
"glslopt",
|
||||
"image",
|
||||
"lazy_static",
|
||||
|
|
@ -6904,13 +6872,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender_api"
|
||||
version = "0.61.0"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"app_units",
|
||||
"bitflags",
|
||||
"byteorder",
|
||||
"core-foundation 0.7.0",
|
||||
"core-graphics 0.19.0",
|
||||
"core-foundation 0.9.0",
|
||||
"core-graphics 0.22.0",
|
||||
"derive_more",
|
||||
"euclid",
|
||||
"malloc_size_of_derive",
|
||||
|
|
@ -6925,7 +6893,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "webrender_build"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"lazy_static",
|
||||
|
|
@ -7104,7 +7072,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "wr_malloc_size_of"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda"
|
||||
source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#920168aff79a7cf52980b0c90965a591f2f4204a"
|
||||
dependencies = [
|
||||
"app_units",
|
||||
"euclid",
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ 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
|
||||
# https://github.com/servo/servo/issues/27515#issuecomment-671474054
|
||||
[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" }
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ euclid = "0.20"
|
|||
font-kit = "0.10"
|
||||
fnv = "1.0"
|
||||
gfx = { path = "../gfx" }
|
||||
gleam = "0.11"
|
||||
gleam = "0.12"
|
||||
half = "1"
|
||||
ipc-channel = "0.14"
|
||||
log = "0.4"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ crossbeam-channel = "0.4"
|
|||
embedder_traits = { path = "../embedder_traits" }
|
||||
euclid = "0.20"
|
||||
gfx_traits = { path = "../gfx_traits" }
|
||||
gleam = { version = "0.11", optional = true }
|
||||
gleam = { version = "0.12", optional = true }
|
||||
image = "0.23"
|
||||
ipc-channel = "0.14"
|
||||
keyboard-types = "0.5"
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ xi-unicode = "0.1.0"
|
|||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
byteorder = "1.0"
|
||||
core-foundation = "0.7"
|
||||
core-graphics = "0.19"
|
||||
core-text = "15.0"
|
||||
core-foundation = "0.9"
|
||||
core-graphics = "0.22"
|
||||
core-text = "19.0"
|
||||
|
||||
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
|
||||
freetype = "0.7"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ env_logger = "0.7"
|
|||
euclid = "0.20"
|
||||
gfx = { path = "../gfx" }
|
||||
gfx_traits = { path = "../gfx_traits" }
|
||||
gleam = "0.11"
|
||||
gleam = "0.12"
|
||||
gstreamer = { version = "0.15", features = ["v1_16"], optional = true }
|
||||
ipc-channel = "0.14"
|
||||
keyboard-types = "0.5"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ packages = [
|
|||
"num-rational",
|
||||
"parking_lot",
|
||||
"parking_lot_core",
|
||||
"png",
|
||||
"wayland-sys",
|
||||
|
||||
# https://github.com/servo/servo/issues/26933
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue