From 50e5853635f1d261516dc3c5366ec5fa3e0890b6 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 30 Jul 2020 11:53:30 -0400 Subject: [PATCH 1/9] update webrender and gleam and macOS crates. --- Cargo.lock | 110 +++++++++++++++++++++--------- Cargo.toml | 6 +- components/canvas/Cargo.toml | 2 +- components/compositing/Cargo.toml | 2 +- components/gfx/Cargo.toml | 6 +- components/servo/Cargo.toml | 2 +- 6 files changed, 87 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ead89ccb7662..5ba968741bfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -538,7 +538,7 @@ dependencies = [ "fnv", "font-kit", "gfx", - "gleam 0.11.0", + "gleam 0.12.1", "half", "ipc-channel", "log", @@ -718,9 +718,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c84c596dcf125d6781f58e3f4254677ec2a6d8aa56e8501ac277100990b3229" +checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb" dependencies = [ "cc", ] @@ -813,7 +813,7 @@ dependencies = [ "embedder_traits", "euclid", "gfx_traits", - "gleam 0.11.0", + "gleam 0.12.1", "image", "ipc-channel", "keyboard-types", @@ -987,6 +987,19 @@ 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" @@ -1023,6 +1036,18 @@ dependencies = [ "libc", ] +[[package]] +name = "core-text" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" +dependencies = [ + "core-foundation 0.9.0", + "core-graphics 0.22.0", + "foreign-types", + "libc", +] + [[package]] name = "crc32fast" version = "1.2.0" @@ -1582,7 +1607,7 @@ dependencies = [ "dirs", "dwrote", "float-ord", - "freetype", + "freetype 0.4.1", "lazy_static", "libc", "log", @@ -1628,6 +1653,27 @@ dependencies = [ "servo-freetype-sys", ] +[[package]] +name = "freetype" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +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", +] + [[package]] name = "fs_extra" version = "1.1.0" @@ -1836,14 +1882,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 19.0.0", "dwrote", "euclid", "fnv", "fontsan", - "freetype", + "freetype 0.4.1", "gfx_traits", "harfbuzz-sys", "ipc-channel", @@ -2067,9 +2113,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", ] @@ -2110,9 +2156,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "glslopt" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c2e941ad25c18428724fd2ad0bc3967cb96242e8db92f3794eedb15c02e44" +checksum = "ade35abcc6d6d49b294b2f39ea0c55ef616b682f4385553c77739f82bf163277" dependencies = [ "cc", ] @@ -2466,7 +2512,7 @@ dependencies = [ "core-graphics 0.17.3", "core-text 13.3.2", "foreign-types", - "freetype", + "freetype 0.4.1", "pkg-config", ] @@ -3187,7 +3233,7 @@ dependencies = [ "gaol", "gfx", "gfx_traits", - "gleam 0.11.0", + "gleam 0.12.1", "gstreamer", "ipc-channel", "keyboard-types", @@ -4160,7 +4206,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/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" dependencies = [ "euclid", "peek-poke-derive", @@ -4169,7 +4215,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/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -5117,9 +5163,9 @@ dependencies = [ [[package]] name = "servo-freetype-sys" -version = "4.0.5" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ccb6d0d32d277d3ef7dea86203d8210945eb7a45fba89dd445b3595dd0dfc" +checksum = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b" dependencies = [ "cmake", "pkg-config", @@ -6785,24 +6831,23 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/jdm/webrender?branch=crash-backtrace#34d968adeda2e06b057a13d14a88df5766b38eda" +source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" dependencies = [ - "backtrace", "base64 0.10.1", "bincode", "bitflags", "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 19.0.0", "cstr", "dwrote", "euclid", - "freetype", + "freetype 0.7.0", "fxhash", - "gleam 0.11.0", + "gleam 0.12.1", "glslopt", "image", "lazy_static", @@ -6815,11 +6860,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 +6874,14 @@ 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/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" 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", + "crossbeam-channel", "derive_more", "euclid", "malloc_size_of_derive", @@ -6850,7 +6896,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/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" dependencies = [ "bitflags", "lazy_static", @@ -7029,7 +7075,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/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" dependencies = [ "app_units", "euclid", diff --git a/Cargo.toml b/Cargo.toml index 4dbe63e439c4..44c6d81c04f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,6 +33,6 @@ mio = { git = "https://github.com/servo/mio.git", branch = "servo-mio-0.6.22" } backtrace = { git = "https://github.com/servo/backtrace-rs", branch = "uwp-fix" } # 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" } +#[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" } diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 2281ea302425..285a9356ab50 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -25,7 +25,7 @@ euclid = "0.20" font-kit = "0.7" fnv = "1.0" gfx = { path = "../gfx" } -gleam = "0.11" +gleam = "0.12" half = "1" ipc-channel = "0.14" log = "0.4" diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 0d4fc881921b..048344af2942 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -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" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 0ffa87835e15..8e4cfce632b2 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -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.4" diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 3b653fcac848..3960ec97c477 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -54,7 +54,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" From f7fc768169c745196a2b0fbd64a5ed7633ed33f1 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 30 Jul 2020 15:15:47 -0400 Subject: [PATCH 2/9] revert to older wr --- Cargo.lock | 111 +++++++------------------------------- Cargo.toml | 2 +- components/gfx/Cargo.toml | 6 +-- 3 files changed, 22 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ba968741bfb..234a20c348cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -935,16 +935,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb" -dependencies = [ - "core-foundation-sys 0.8.0", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.6.2" @@ -957,12 +947,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" -[[package]] -name = "core-foundation-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a21fa21941700a3cd8fcb4091f361a6a712fac632f85d9f487cc892045d55c6" - [[package]] name = "core-graphics" version = "0.17.3" @@ -987,31 +971,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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c" -dependencies = [ - "bitflags", - "core-foundation 0.9.0", - "foreign-types", - "libc", -] - [[package]] name = "core-text" version = "13.3.2" @@ -1036,18 +995,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-text" -version = "19.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" -dependencies = [ - "core-foundation 0.9.0", - "core-graphics 0.22.0", - "foreign-types", - "libc", -] - [[package]] name = "crc32fast" version = "1.2.0" @@ -1607,7 +1554,7 @@ dependencies = [ "dirs", "dwrote", "float-ord", - "freetype 0.4.1", + "freetype", "lazy_static", "libc", "log", @@ -1653,27 +1600,6 @@ dependencies = [ "servo-freetype-sys", ] -[[package]] -name = "freetype" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" -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", -] - [[package]] name = "fs_extra" version = "1.1.0" @@ -1882,14 +1808,14 @@ dependencies = [ "app_units", "bitflags", "byteorder", - "core-foundation 0.9.0", - "core-graphics 0.22.0", - "core-text 19.0.0", + "core-foundation 0.7.0", + "core-graphics 0.19.0", + "core-text 15.0.0", "dwrote", "euclid", "fnv", "fontsan", - "freetype 0.4.1", + "freetype", "gfx_traits", "harfbuzz-sys", "ipc-channel", @@ -2512,7 +2438,7 @@ dependencies = [ "core-graphics 0.17.3", "core-text 13.3.2", "foreign-types", - "freetype 0.4.1", + "freetype", "pkg-config", ] @@ -4206,7 +4132,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4141,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6757,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "base64 0.10.1", "bincode", @@ -6839,13 +6765,13 @@ dependencies = [ "build-parallel", "byteorder", "cfg-if", - "core-foundation 0.9.0", - "core-graphics 0.22.0", - "core-text 19.0.0", + "core-foundation 0.7.0", + "core-graphics 0.19.0", + "core-text 15.0.0", "cstr", "dwrote", "euclid", - "freetype 0.7.0", + "freetype", "fxhash", "gleam 0.12.1", "glslopt", @@ -6874,14 +6800,13 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "app_units", "bitflags", "byteorder", - "core-foundation 0.9.0", - "core-graphics 0.22.0", - "crossbeam-channel", + "core-foundation 0.7.0", + "core-graphics 0.19.0", "derive_more", "euclid", "malloc_size_of_derive", @@ -6896,7 +6821,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "bitflags", "lazy_static", @@ -7075,7 +7000,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#a9955c944997bd13467dd5c46265bb9359f0855b" +source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" dependencies = [ "app_units", "euclid", diff --git a/Cargo.toml b/Cargo.toml index 44c6d81c04f8..ec1b1cd9cc42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ exclude = [".cargo"] [profile.release] opt-level = 3 # Uncomment to profile on Linux: -# debug = true +debug = true # lto = false [patch.crates-io] diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 8e4cfce632b2..0ffa87835e15 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -43,9 +43,9 @@ 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.4" From a19f4dc97eceb6f8cede51be00317435d552dd0d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 30 Jul 2020 17:11:15 -0400 Subject: [PATCH 3/9] update macos deps again --- Cargo.lock | 59 ++++++++++++++++++- components/gfx/Cargo.toml | 6 +- .../gfx/platform/macos/font_template.rs | 2 +- 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 234a20c348cf..49e5bddd6fe0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -935,6 +935,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b5ed8e7e76c45974e15e41bfa8d5b0483cd90191639e01d8f5f1e606299d3fb" +dependencies = [ + "core-foundation-sys 0.8.0", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.6.2" @@ -947,6 +957,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "core-foundation-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a21fa21941700a3cd8fcb4091f361a6a712fac632f85d9f487cc892045d55c6" + [[package]] name = "core-graphics" version = "0.17.3" @@ -971,6 +987,31 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c" +dependencies = [ + "bitflags", + "core-foundation 0.9.0", + "foreign-types", + "libc", +] + [[package]] name = "core-text" version = "13.3.2" @@ -995,6 +1036,18 @@ dependencies = [ "libc", ] +[[package]] +name = "core-text" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" +dependencies = [ + "core-foundation 0.9.0", + "core-graphics 0.22.0", + "foreign-types", + "libc", +] + [[package]] name = "crc32fast" version = "1.2.0" @@ -1808,9 +1861,9 @@ 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 19.0.0", "dwrote", "euclid", "fnv", diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 0ffa87835e15..8e4cfce632b2 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -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.4" diff --git a/components/gfx/platform/macos/font_template.rs b/components/gfx/platform/macos/font_template.rs index 9d9f1fab7a9b..45b5b50c274b 100644 --- a/components/gfx/platform/macos/font_template.rs +++ b/components/gfx/platform/macos/font_template.rs @@ -167,7 +167,7 @@ impl FontTemplateData { /// Returns the native font that underlies this font template, if applicable. pub fn native_font(&self) -> Option { self.ctfont(0.0) - .map(|ctfont| NativeFontHandle(ctfont.copy_to_CGFont())) + .map(|ctfont| NativeFontHandle(unsafe { std::mem::transmute(ctfont.copy_to_CGFont()) })) } } From 84a82c4a81658b918fe97ad7a3d562fbde95ed09 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 30 Jul 2020 18:21:12 -0400 Subject: [PATCH 4/9] update webrender to pick up new deps again --- Cargo.lock | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49e5bddd6fe0..f95822ac6c79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1607,7 +1607,7 @@ dependencies = [ "dirs", "dwrote", "float-ord", - "freetype", + "freetype 0.4.1", "lazy_static", "libc", "log", @@ -1653,6 +1653,27 @@ dependencies = [ "servo-freetype-sys", ] +[[package]] +name = "freetype" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +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", +] + [[package]] name = "fs_extra" version = "1.1.0" @@ -1868,7 +1889,7 @@ dependencies = [ "euclid", "fnv", "fontsan", - "freetype", + "freetype 0.4.1", "gfx_traits", "harfbuzz-sys", "ipc-channel", @@ -2491,7 +2512,7 @@ dependencies = [ "core-graphics 0.17.3", "core-text 13.3.2", "foreign-types", - "freetype", + "freetype 0.4.1", "pkg-config", ] @@ -4185,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" dependencies = [ "euclid", "peek-poke-derive", @@ -4194,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6810,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" dependencies = [ "base64 0.10.1", "bincode", @@ -6818,13 +6839,13 @@ 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 19.0.0", "cstr", "dwrote", "euclid", - "freetype", + "freetype 0.7.0", "fxhash", "gleam 0.12.1", "glslopt", @@ -6853,13 +6874,13 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" 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", @@ -6874,7 +6895,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" dependencies = [ "bitflags", "lazy_static", @@ -7053,7 +7074,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#64f1d8a0490c3ac73f40559e6b79f8c7864a4436" +source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" dependencies = [ "app_units", "euclid", From 7fe20d9510ef66b48df61354de256005fd76279e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 30 Jul 2020 19:49:18 -0400 Subject: [PATCH 5/9] more update wr --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f95822ac6c79..044354b4f625 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4206,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "base64 0.10.1", "bincode", @@ -6874,7 +6874,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "app_units", "bitflags", @@ -6895,7 +6895,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "bitflags", "lazy_static", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#96f087803b126ff04bdb09830c129ec73f2437a1" +source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" dependencies = [ "app_units", "euclid", From 035b63dd4c878b96f3b77ac3c25afeebecf4ec1b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 31 Jul 2020 09:24:37 -0400 Subject: [PATCH 6/9] update wr further --- Cargo.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 044354b4f625..9c41bc18ed11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4206,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" +source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" +source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" +source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "base64 0.10.1", "bincode", @@ -6874,13 +6874,14 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" +source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "app_units", "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", + "crossbeam-channel", "derive_more", "euclid", "malloc_size_of_derive", @@ -6895,7 +6896,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#0bf15cbdbda530f733511f169194439e197e0f40" +source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "bitflags", "lazy_static", @@ -7074,7 +7075,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/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" dependencies = [ "app_units", "euclid", From dd1629ad292c1cdd269bf5d039ac5e6c3cf2a4f8 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 31 Jul 2020 10:35:34 -0400 Subject: [PATCH 7/9] back up a bit --- Cargo.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c41bc18ed11..b66b98713488 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4206,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "base64 0.10.1", "bincode", @@ -6874,14 +6874,13 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "app_units", "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", - "crossbeam-channel", "derive_more", "euclid", "malloc_size_of_derive", @@ -6896,7 +6895,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "bitflags", "lazy_static", @@ -7075,7 +7074,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#ed6ed92ac1cdfa39118fb95b63df7ea804fbbbd1" +source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" dependencies = [ "app_units", "euclid", From 160470c8711bbe8d667becc8dd0e18c774f8ea6f Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 31 Jul 2020 12:42:36 -0400 Subject: [PATCH 8/9] update a little further --- Cargo.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b66b98713488..138e19454e8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4206,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "base64 0.10.1", "bincode", @@ -6874,13 +6874,14 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "app_units", "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", + "crossbeam-channel", "derive_more", "euclid", "malloc_size_of_derive", @@ -6895,7 +6896,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "bitflags", "lazy_static", @@ -7074,7 +7075,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#497199f2755e4378f794e495aaf42c4048be7625" +source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" dependencies = [ "app_units", "euclid", From 32b7a790f2af1f39f4098a13fe7983a20bfb6e39 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 31 Jul 2020 14:23:13 -0400 Subject: [PATCH 9/9] back up before crossbeam --- Cargo.lock | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 138e19454e8d..247accf08ed1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4206,7 +4206,7 @@ dependencies = [ [[package]] name = "peek-poke" version = "0.2.0" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "euclid", "peek-poke-derive", @@ -4215,7 +4215,7 @@ dependencies = [ [[package]] name = "peek-poke-derive" version = "0.2.1" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "proc-macro2 1.0.17", "quote 1.0.2", @@ -6831,7 +6831,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.61.0" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "base64 0.10.1", "bincode", @@ -6874,14 +6874,13 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.61.0" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "app_units", "bitflags", "byteorder", "core-foundation 0.9.0", "core-graphics 0.22.0", - "crossbeam-channel", "derive_more", "euclid", "malloc_size_of_derive", @@ -6896,7 +6895,7 @@ dependencies = [ [[package]] name = "webrender_build" version = "0.0.1" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "bitflags", "lazy_static", @@ -7075,7 +7074,7 @@ dependencies = [ [[package]] name = "wr_malloc_size_of" version = "0.0.1" -source = "git+https://github.com/servo/webrender#46791f3fd9188ab3178ab612de168ec554669be7" +source = "git+https://github.com/servo/webrender#1f810c77b27bf9b959b716fbc9bf4ab710ecccc0" dependencies = [ "app_units", "euclid",