Skip to content

Commit bfd0b6b

Browse files
nicoburnsmrobinson
authored andcommitted
Prepare WebRender for crates.io release
Changes made: - Update webrender and in-repo crates that are dependencies of webrender to version 0.68 - Update these crates to use workspace depency versions similar to stylo#249 (seeing as the feedback on that change was positive). I have not bothered updating the versions of the other in-repo crates that are not dependencies of webrender (e.g. wrench and crates that are used by wrench like swgl) as we don't need to publish those and thus their version numbers don't matter, and I figured it would keep the diff a little smaller. But it would be easy to update those too if we wanted to. Signed-off-by: Nico Burns <nico@nicoburns.com>
1 parent 6cafc60 commit bfd0b6b

File tree

12 files changed

+41
-28
lines changed

12 files changed

+41
-28
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install Rust
1818
uses: dtolnay/rust-toolchain@stable
1919
- name: Install freetype
20-
run: sudo apt install libfreetype-dev
20+
run: sudo apt update && sudo apt install -y libfreetype-dev
2121
- name: Build wrench
2222
run: |
2323
cd wrench

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ members = [
88
]
99
resolver = "2"
1010

11+
[workspace.package]
12+
version = "0.68.0"
13+
1114
[workspace.dependencies]
15+
api = { version = "0.68", path = "./webrender_api", package = "webrender_api" }
16+
glsl-to-cxx = { version = "0.68", path = "./glsl-to-cxx", package = "glsl-to-cxx" }
17+
glyph_rasterizer = { version = "0.68", path = "./wr_glyph_rasterizer", package = "wr_glyph_rasterizer" }
18+
malloc_size_of = { version = "0.2.2", path = "./wr_malloc_size_of", package = "wr_malloc_size_of" }
19+
peek-poke = { version = "0.3", path = "./peek-poke", package = "peek-poke" }
20+
swgl = { version = "0.68", path = "./swgl", package = "swgl" }
21+
webrender = { version = "0.68", path = "./webrender", package = "webrender" }
22+
webrender_build = { version = "0.68", path = "./webrender_build", package = "webrender_build" }
23+
1224
gleam = "0.15.1"
1325
glean = "=65.2.1"
1426

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
WebRender is a GPU-based 2D rendering engine written in [Rust](https://www.rust-lang.org/). [Firefox](https://www.mozilla.org/firefox), the research web browser [Servo](https://github.com/servo/servo), and other GUI frameworks draw with it. It currently uses the OpenGL API internally.
66

7-
Note that the canonical home for this code is in gfx/wr folder of the
8-
mozilla-central repository at https://hg.mozilla.org/mozilla-central. The
7+
Note that the canonical home for this code is in [gfx/wr folder[(https://github.com/mozilla-firefox/firefox/tree/main/gfx/wr)] of the
8+
mozilla-central repository at https://github.com/mozilla-firefox/firefox. The
99
Github repository at https://github.com/servo/webrender should be considered
1010
a downstream mirror, although it contains additional metadata (such as Github
1111
wiki pages) that do not exist in mozilla-central. Pull requests against the

glsl-to-cxx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "glsl-to-cxx"
3-
version = "0.1.0"
3+
version.workspace = true
44
license = "MPL-2.0"
55
authors = ["The Mozilla Project Developers", "Dimitri Sabadie"]
66
edition = "2018"

swgl/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[package]
22
name = "swgl"
3-
version = "0.1.0"
3+
version.workspace = true
44
license = "MPL-2.0"
55
authors = ["The Mozilla Project Developers"]
66
build = "build.rs"
77
description = "Software OpenGL implementation for WebRender."
88

99
[build-dependencies]
1010
cc = "1.0.46"
11-
glsl-to-cxx = { path = "../glsl-to-cxx" }
12-
webrender_build = { path = "../webrender_build" }
11+
glsl-to-cxx = { workspace = true }
12+
webrender_build = { workspace = true }
1313

1414
[dependencies]
1515
gleam = { workspace = true }

webrender/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "webrender"
3-
version = "0.68.0"
3+
version.workspace = true
44
authors = ["Glenn Watson <gw@intuitionlibrary.com>"]
55
license = "MPL-2.0"
66
repository = "https://github.com/servo/webrender"
@@ -25,7 +25,7 @@ debugger = ["tiny_http", "serde_json", "url", "sha1", "base64", "api/debugger"]
2525
[build-dependencies]
2626
build-parallel = "0.1.2"
2727
glslopt = "0.1.11"
28-
webrender_build = { version = "0.0.2", path = "../webrender_build" }
28+
webrender_build = { workspace = true }
2929

3030
[dependencies]
3131
bincode = "1.0"
@@ -44,10 +44,10 @@ rayon = "1"
4444
ron = { optional = true, version = "0.10.0" }
4545
serde = { optional = true, version = "1.0", features = ["serde_derive"] }
4646
smallvec = "1"
47-
api = { version = "0.68.0", path = "../webrender_api", package = "webrender_api" }
48-
webrender_build = { version = "0.0.2", path = "../webrender_build" }
49-
malloc_size_of = { version = "0.2.0", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
50-
glyph_rasterizer = { version = "0.1.0", path = "../wr_glyph_rasterizer", package = "wr_glyph_rasterizer", default-features = false }
47+
api = { workspace = true }
48+
webrender_build = { workspace = true }
49+
malloc_size_of = { workspace = true }
50+
glyph_rasterizer = { workspace = true }
5151
svg_fmt = "0.4"
5252
tracy-rs = "0.1.2"
5353
derive_more = { version = "2", features = ["add_assign"] }

webrender/src/render_backend.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,8 +1491,9 @@ impl RenderBackend {
14911491
.cloned()
14921492
.filter(|key| !document_already_present(*key))
14931493
.collect();
1494-
#[allow(unused_variables)]
1494+
#[cfg_attr(not(feature = "capture"), allow(unused_variables))]
14951495
let mut built_frame = false;
1496+
#[cfg_attr(not(feature = "capture"), allow(unused_assignments))]
14961497
for &document_id in &nop_documents {
14971498
built_frame |= self.update_document(
14981499
document_id,

webrender_api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ malloc_size_of_derive = "0.1"
2323
serde = { version = "1.0", features = ["rc"] }
2424
serde_derive = "1.0"
2525
serde_bytes = "0.11"
26-
malloc_size_of = { version = "0.2.0", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
27-
peek-poke = { version = "0.3", path = "../peek-poke", features = ["extras"] }
26+
malloc_size_of = { workspace = true }
27+
peek-poke = { workspace = true, features = ["extras"] }
2828
crossbeam-channel = "0.5"
2929
zeitstempel = "0.1.2"

webrender_build/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "webrender_build"
33
authors = ["The Servo Project Developers"]
4-
version = "0.0.2"
4+
version.workspace = true
55
license = "MPL-2.0"
66
repository = "https://github.com/servo/webrender"
77
description = "Code shared between precompilation (build.rs) and the rest of WebRender"

0 commit comments

Comments
 (0)