Skip to content

Commit 0cd1c7d

Browse files
mrobinsonGae24
authored andcommitted
deps: Upgrade to WebRender 0.65 (servo#32930)
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
1 parent 52176b9 commit 0cd1c7d

File tree

5 files changed

+37
-27
lines changed

5 files changed

+37
-27
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ url = "2.5"
135135
uuid = { version = "1.10.0", features = ["v4"] }
136136
webdriver = "0.49.0"
137137
webpki-roots = "0.25"
138-
webrender = { git = "https://github.com/servo/webrender", branch = "0.64", features = ["capture"] }
139-
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.64" }
138+
webrender = { git = "https://github.com/servo/webrender", branch = "0.65", features = ["capture"] }
139+
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" }
140140
webrender_traits = { path = "components/shared/webrender" }
141141
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "69eea63757f097bc0953e5ed607eefe1977f9efa" }
142142
wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "69eea63757f097bc0953e5ed607eefe1977f9efa" }
@@ -171,6 +171,7 @@ strip = true
171171
#
172172
# [patch."https://github.com/servo/stylo"]
173173
# derive_common = { path = "../stylo/derive_common" }
174+
# dom = { path = "../stylo/dom" }
174175
# malloc_size_of = { path = "../stylo/malloc_size_of" }
175176
# selectors = { path = "../stylo/selectors" }
176177
# servo_arc = { path = "../stylo/servo_arc" }
@@ -183,6 +184,12 @@ strip = true
183184
# style_traits = { path = "../stylo/style_traits" }
184185
# to_shmem = { path = "../stylo/to_shmem" }
185186
#
187+
# Or for WebRender:
188+
#
189+
# [patch."https://github.com/servo/webrender"]
190+
# webrender = { path = "../webrender/webrender" }
191+
# webrender_api = { path = "../webrender/webrender_api" }
192+
#
186193
# Or for another Git dependency:
187194
#
188195
# [patch."https://github.com/servo/<repository>"]

components/layout/display_list/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,7 @@ impl Fragment {
21992199
font_key: text_fragment.run.font_key,
22002200
color: text_color.to_layout(),
22012201
glyph_options: None,
2202+
ref_frame_offset: LayoutVector2D::zero(),
22022203
},
22032204
glyphs,
22042205
)));

components/layout/display_list/webrender_helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ impl DisplayItem {
469469
sticky_data.horizontal_offset_bounds,
470470
LayoutVector2D::zero(), /* previously_applied_offset */
471471
self.get_spatial_tree_item_key(builder, index),
472+
None, /* transform */
472473
);
473474

474475
state.add_clip_node_mapping(index, parent_clip_chain_id);

components/layout_2020/display_list/stacking_context.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ impl DisplayList {
227227
horizontal_offset_bounds,
228228
LayoutVector2D::zero(), /* previously_applied_offset */
229229
spatial_tree_item_key,
230+
None, /* transform */
230231
);
231232
self.compositor_info.scroll_tree.add_scroll_tree_node(
232233
Some(parent_scroll_node_id),

0 commit comments

Comments
 (0)