mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #29961 - mrobinson:vendor-webrender, r=atbakhi
Vendor the current version of WebRender This is a step toward upgrading WebRender, which will be upgraded and patched in the `third_party` directory. This change vendors the current private branch of WebRender that we use and adds a `patches` directory which tracks the changes on top of the upstream WebRender commit described by third_party/webrender/patches/head. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they do not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
041d95e0f4
1215 changed files with 185677 additions and 34 deletions
|
@ -44,8 +44,8 @@ surfman = { workspace = true, features = ["sm-angle","sm-angle-default"] }
|
|||
surfman-chains = { workspace = true }
|
||||
surfman-chains-api = { workspace = true }
|
||||
time = { workspace = true, optional = true }
|
||||
webrender = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender = { workspace = true }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_surfman = { path = "../webrender_surfman" }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
|
|
@ -29,5 +29,5 @@ servo_config = { path = "../config" }
|
|||
sparkle = { workspace = true }
|
||||
style = { path = "../style" }
|
||||
time = { workspace = true, optional = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
|
|
@ -39,8 +39,8 @@ servo_geometry = { path = "../geometry" }
|
|||
servo_url = { path = "../url" }
|
||||
style_traits = { path = "../style_traits" }
|
||||
time = { workspace = true }
|
||||
webrender = { git = "https://github.com/servo/webrender", features = ["capture"] }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender = { workspace = true }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_surfman = { path = "../webrender_surfman" }
|
||||
webxr = { git = "https://github.com/servo/webxr" }
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ servo_remutex = { path = "../remutex" }
|
|||
servo_url = { path = "../url" }
|
||||
style_traits = { path = "../style_traits" }
|
||||
webgpu = { path = "../webgpu" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ num-derive = "0.3"
|
|||
num-traits = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
servo_url = { path = "../url" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
|
|
@ -38,7 +38,7 @@ time = { workspace = true }
|
|||
ucd = "0.1.1"
|
||||
unicode-bidi = { workspace = true, features = ["with_serde"] }
|
||||
unicode-script = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
xi-unicode = { workspace = true }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
|
|
|
@ -15,4 +15,4 @@ malloc_size_of = { path = "../malloc_size_of" }
|
|||
malloc_size_of_derive = { workspace = true }
|
||||
range = { path = "../range" }
|
||||
serde = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
|
|
@ -49,7 +49,7 @@ style = { path = "../style", features = ["servo", "servo-layout-2013"] }
|
|||
style_traits = { path = "../style_traits" }
|
||||
unicode-bidi = { workspace = true, features = ["with_serde"] }
|
||||
unicode-script = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
xi-unicode = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
|
@ -44,7 +44,7 @@ servo_url = { path = "../url" }
|
|||
style = { path = "../style", features = ["servo", "servo-layout-2020"] }
|
||||
style_traits = { path = "../style_traits" }
|
||||
unicode-script = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
lazy_static = { workspace = true }
|
||||
|
|
|
@ -49,4 +49,4 @@ servo_url = { path = "../url" }
|
|||
style = { path = "../style" }
|
||||
style_traits = { path = "../style_traits" }
|
||||
time = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
|
|
@ -45,4 +45,4 @@ servo_config = { path = "../config" }
|
|||
servo_url = { path = "../url" }
|
||||
style = { path = "../style" }
|
||||
style_traits = { path = "../style_traits" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
|
|
@ -20,4 +20,4 @@ net_traits = { path = "../net_traits" }
|
|||
profile_traits = { path = "../profile_traits" }
|
||||
script_traits = { path = "../script_traits" }
|
||||
servo_url = { path = "../url" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
|
|
@ -49,5 +49,5 @@ tokio = { workspace = true }
|
|||
url = { workspace = true, optional = true }
|
||||
uuid = { workspace = true, optional = true }
|
||||
void = "1.0.2"
|
||||
webrender_api = { git = "https://github.com/servo/webrender", optional = true }
|
||||
webrender_api = { workspace = true, optional = true }
|
||||
xml5ever = { workspace = true, optional = true }
|
||||
|
|
|
@ -19,5 +19,5 @@ log = { workspace = true }
|
|||
serde = { workspace = true }
|
||||
servo-media = { git = "https://github.com/servo/media" }
|
||||
servo_config = { path = "../config" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
|
|
|
@ -19,7 +19,7 @@ malloc_size_of = { path = "../malloc_size_of" }
|
|||
malloc_size_of_derive = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
size_of_test = { path = "../size_of_test" }
|
||||
|
|
|
@ -65,7 +65,7 @@ tokio-stream = "0.1"
|
|||
tungstenite = "0.19"
|
||||
url = { workspace = true }
|
||||
uuid = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
futures = {version = "0.3", features = ["compat"]}
|
||||
|
|
|
@ -117,7 +117,7 @@ utf-8 = "0.7"
|
|||
uuid = { workspace = true, features = ["serde"] }
|
||||
webdriver = { workspace = true }
|
||||
webgpu = { path = "../webgpu" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
xml5ever = { workspace = true }
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@ time = { workspace = true }
|
|||
uuid = { workspace = true }
|
||||
webdriver = { workspace = true }
|
||||
webgpu = { path = "../webgpu" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
|
@ -81,8 +81,8 @@ style_traits = { path = "../style_traits", features = ["servo"] }
|
|||
surfman = { workspace = true }
|
||||
webdriver_server = { path = "../webdriver_server", optional = true }
|
||||
webgpu = { path = "../webgpu" }
|
||||
webrender = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender = { workspace = true }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_surfman = { path = "../webrender_surfman" }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
webxr = { git = "https://github.com/servo/webxr" }
|
||||
|
|
|
@ -29,4 +29,4 @@ servo_atoms = { path = "../atoms", optional = true }
|
|||
servo_url = { path = "../url", optional = true }
|
||||
to_shmem = { path = "../to_shmem" }
|
||||
to_shmem_derive = { path = "../to_shmem_derive" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender", optional = true }
|
||||
webrender_api = { workspace = true, optional = true }
|
||||
|
|
|
@ -20,7 +20,7 @@ msg = { path = "../msg" }
|
|||
serde = { workspace = true, features = ["serde_derive"] }
|
||||
servo_config = { path = "../config" }
|
||||
smallvec = { workspace = true, features = ["serde"] }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
wgpu-core = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace", "serial-pass"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" }
|
||||
wgpu-types = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" }
|
||||
|
|
|
@ -12,5 +12,5 @@ path = "lib.rs"
|
|||
|
||||
[dependencies]
|
||||
euclid = { workspace = true }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { workspace = true }
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue