servo: Merge #16917 - Update WR (Intel driver workaround, subpixel and other bugfixes) (from glennw:update-wr-bugs); r=emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: e91ffafd826bd3f0449d2822e40278defffd75a2

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 79c94fe849fd3edc05b3aa8e2da4f2a871ef9e56
This commit is contained in:
Glenn Watson 2017-05-22 07:00:39 -05:00
Родитель 1bdc87018b
Коммит 5101e15ecb
2 изменённых файлов: 10 добавлений и 2 удалений

4
servo/Cargo.lock сгенерированный
Просмотреть файл

@ -3298,7 +3298,7 @@ dependencies = [
[[package]]
name = "webrender"
version = "0.39.0"
source = "git+https://github.com/servo/webrender#4ab9b9b00b00c93a51469775f56c53eeea68b5ab"
source = "git+https://github.com/servo/webrender#c003d553bdd856e1e78d213375582a1f2b091a06"
dependencies = [
"app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3327,7 +3327,7 @@ dependencies = [
[[package]]
name = "webrender_traits"
version = "0.39.0"
source = "git+https://github.com/servo/webrender#4ab9b9b00b00c93a51469775f56c53eeea68b5ab"
source = "git+https://github.com/servo/webrender#c003d553bdd856e1e78d213375582a1f2b091a06"
dependencies = [
"app_units 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)",

Просмотреть файл

@ -458,6 +458,14 @@ class MachCommands(CommandBase):
def wptrunner(self, run_file, **kwargs):
self.set_software_rendering_env(kwargs['release'])
# By default, Rayon selects the number of worker threads
# based on the available CPU count. This doesn't work very
# well when running tests on CI, since we run so many
# Servo processes in parallel. The result is a lot of
# extra timeouts. Instead, force Rayon to assume we are
# running on a 2 CPU environment.
os.environ['RAYON_RS_NUM_CPUS'] = "2"
os.environ["RUST_BACKTRACE"] = "1"
kwargs["debug"] = not kwargs["release"]
if kwargs.pop("chaos"):