Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18339 - glennw:update-wr-misc, r=jdm

Browse source 
Update WR (mac driver crash, box shadow sharing).

* Works around a driver / kernel crash on some mac machines.
* Allow more sharing of box shadow and clip render tasks.
* Some shader tidy ups.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18339)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-01 21:42:28 -05:00 • committed by GitHub
commit 7e3c8dee71
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3551,7 +3551,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.50.0" version = "0.50.0"
source = "git+https://github.com/servo/webrender#eee6067ba4c9e3bb0edfe125919eee8163ba1de5" source = "git+https://github.com/servo/webrender#e7c60ad67ca9c0732be18c3df25b686f12d652ca"
dependencies = [ dependencies = [
"app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3579,7 +3579,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.50.0" version = "0.50.0"
source = "git+https://github.com/servo/webrender#eee6067ba4c9e3bb0edfe125919eee8163ba1de5" source = "git+https://github.com/servo/webrender#e7c60ad67ca9c0732be18c3df25b686f12d652ca"
dependencies = [ dependencies = [
"app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",

3
components/compositing/compositor.rs
View file

@ -1285,7 +1285,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
debug!("compositor: compositing"); debug!("compositor: compositing");
// Paint the scene. // Paint the scene.
self.webrender.render(self.frame_size); // TODO(gw): Take notice of any errors the renderer returns!
self.webrender.render(self.frame_size).ok();
}); });
// If there are pending paint metrics, we check if any of the painted epochs is // If there are pending paint metrics, we check if any of the painted epochs is