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 #17196 - glennw:update-wr-cache-glyphs, r=jdm

Browse source 
Update WR (move glyph data to gpu cache and halve glyph alloc/uploads).

<!-- 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/17196)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-07 22:55:53 -07:00 • committed by GitHub
commit 12dca42dd7
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3352,7 +3352,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.40.0" version = "0.40.0"
source = "git+https://github.com/servo/webrender#b2614e4eb58f9dee08b8c38f96bc3bac834c837b" source = "git+https://github.com/servo/webrender#caec344131e53c13b022feedbf9d5e04054232c3"
dependencies = [ dependencies = [
"app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3381,7 +3381,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_traits" name = "webrender_traits"
version = "0.40.0" version = "0.40.0"
source = "git+https://github.com/servo/webrender#b2614e4eb58f9dee08b8c38f96bc3bac834c837b" source = "git+https://github.com/servo/webrender#caec344131e53c13b022feedbf9d5e04054232c3"
dependencies = [ dependencies = [
"app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",

4
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -22738,11 +22738,11 @@
"support" "support"
], ],
"css/multiple_backgrounds.html": [ "css/multiple_backgrounds.html": [
"fef5a64b3dfe66ba69c6f49a80ac6ac0b8099278", "6ca8f5d4383f10b14446462071932e31d7de1aa4",
"reftest" "reftest"
], ],
"css/multiple_backgrounds_ref.html": [ "css/multiple_backgrounds_ref.html": [
"9a2f39aaa51a30f510cf7ced78a3b704126a09f5", "a218179031b80f724d23fbcca9eb9f56c5f773fc",
"support" "support"
], ],
"css/multiple_css_class_a.html": [ "css/multiple_css_class_a.html": [

4
tests/wpt/mozilla/tests/css/multiple_backgrounds.html
View file

@ -18,8 +18,8 @@
#multibg { #multibg {
width: 700px; width: 700px;
height: 400px; height: 400px;
background: url(rust-logo-256x256.png) no-repeat bottom right / 256px 256px, background: url("rust-logo-256x256.png") no-repeat bottom right / 256px 256px,
url(bubbles.png) no-repeat left / 700px 100%, url("bubbles.png?pipe=trickle(d1)") no-repeat left / 700px 100%,
linear-gradient(to right, rgba(30, 75, 115, 1), rgba(255, 255, 255, 0)) no-repeat; linear-gradient(to right, rgba(30, 75, 115, 1), rgba(255, 255, 255, 0)) no-repeat;
} }
</style> </style>

4
tests/wpt/mozilla/tests/css/multiple_backgrounds_ref.html
View file

@ -22,13 +22,13 @@
#bubblesbg { #bubblesbg {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url(bubbles.png) no-repeat left / 700px 100%; background: url("bubbles.png?pipe=trickle(d1)") no-repeat left / 700px 100%;
position: relative; position: relative;
} }
#rustbg { #rustbg {
width: 256px; width: 256px;
height: 256px; height: 256px;
background: url(rust-logo-256x256.png) no-repeat left / 256px 256px; background: url("rust-logo-256x256.png") no-repeat left / 256px 256px;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; right: 0;