Граф коммитов

122 Коммитов

Автор SHA1 Сообщение Дата
Anthony Ramine c3c12ee7dc servo: Merge #15136 - Use mitochondria::OnceCell to store ScriptThread in TLS (from nox:mitochondria-finally-makes-it-into-the-tree); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ca6376a7142640185f21beca4b11011e8367ec91
2017-01-23 03:17:33 -08:00
Boris Chiou 1bd7c8c532 servo: Merge #15150 - Update selectors to 0.15.1 (from BorisChiou:update_selectors); r=heycam
selectors 0.15.1 supports AFFECTED_BY_ANIMATIONS and
AFFECTED_BY_TRANSITIONS, which are used by stylo animations.

Reference:
https://bugzilla.mozilla.org/show_bug.cgi?id=1317209

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix Bug 1317209
- [X] These changes do not require tests because I only update the version, which only added two StyleRelations flags, and are not used yet

Source-Repo: https://github.com/servo/servo
Source-Revision: 0170138887005215b2b6e194d8765e33ff3a2657
2017-01-22 23:07:30 -08:00
Simon Sapin 21e15515ca servo: Merge #15099 - Remove usage of phf_macros (from servo:phf-no-macros); r=jdm
It’s a compiler plugin that uses unstable compiler APIs that are not on a path to stabilization.

With this changes, there is one less thing that might break when we update the compiler. For example: https://github.com/sfackler/rust-phf/pull/101

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: eade32ed16569806a849e74a395d92a2dbd980a0
2017-01-20 08:59:26 -08:00
Ms2ger d57a68187f servo: Merge #15108 - Don't try to get the global of an object while it's being destroyed (from servo:callbackobject-drop); r=KiChjang
Fixes #15070.
Fixes #15097.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2c816a2e9dfe3eb6952fd61f5a96cf26668ad9c8
2017-01-19 03:05:17 -08:00
Vladimir Vukicevic be8f0e0ee8 servo: Merge #15096 - Implement downloadable fonts on Windows (from vvuk:custom-font-files); r=emilio
This PR implements downloadable font support for Servo.  It depends on new changes in webrender and dwrote, and adds a dependency on the `truetype` crate for pulling out basic font information.  The original DirectWrite API does not provide an easy way to query font information direct from a `FontFace` (which is what you create from a `FontFile`).  There are new DirectWrite APIs starting with Windows 10 that allow for this, but they are Win 10+ only, and `winapi-rs` does not yet have bindings for those versions of the interfaces (specificially, `IDirectWriteFontFace3`).  The way to do this with DW is to go through a lot of pain in creating a custom collection and enumerator, add your font to your custom collection, then query the collection for its properties.

Instead, we just parse the truetype tables directly to pull out the few bits of information that we need.  The `truetype` crate is ok, but I discovered some bugs (an update needs to get pushed to crates.io before this will build).  It might be more worthwhile to just implement the tiny bit of truetype parsing that we need ourselves in Servo.

I'm guessing there are existing tests for downloadable fonts...

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 1a7404e38c0f0e9c58487299956bec78589191c7
2017-01-18 16:09:51 -08:00
Glenn Watson 66e90835ac servo: Merge #15094 - Update WR (driver stall workaround, shared clips, dwrote update) (from glennw:update-wr-driver-stalls); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: c1238291e9c71b4e2ea24604d9714395832992fb
2017-01-18 06:52:04 -08:00
Paul Rouget 53573083db servo: Merge #15074 - Remove browserhtml dependency from components/servo (from paulrouget:removeBhtmlFromComponent); r=Ms2ger
Fix #15066

Source-Repo: https://github.com/servo/servo
Source-Revision: a73fd01f01945d88a565c4c65f4049d64dc89bf0
2017-01-17 10:56:22 -08:00
Ms2ger 9daf6ebddb servo: Merge #15073 - Apply minor dependency updates (from servo:always-be-updating); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 06f66abd4a4769bc0528b77a6d7f336900e2edef
2017-01-17 10:00:46 -08:00
Martin Robinson 68043687bf servo: Merge #14979 - Only create scrolling overflow regions when necessary (from mrobinson:scroll-roots-when-necessary); r=emilio
Only create scroll roots for overflow regions when the overflow region
is actually larger than the container size. This prevents creating
scrolling roots for elements that do not have overflow scroll as a
side-effect of the way their height and width is defined. For example,
tables should never respect overflow:scroll since their height and
width should always be large enough to prevent overflow. This also
decreases the size and complexity of the display list in many other
circumstances.

As part of this change, transformed overflow calculation is moved from
display list construction to layout. This should mean that overflow is
handled more accurately earlier.

Fixes #14574.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14574 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3ab514302f964a76938b8c87b4f27edb00d0f537
2017-01-17 07:18:42 -08:00
Ms2ger f65f07eed7 servo: Merge #15048 - Update mozjs_sys (from servo:update-mozjs); r=jdm
Fixes #15025.

Source-Repo: https://github.com/servo/servo
Source-Revision: 363f590019e495fffab0cc0fa0464e05d2fc96e8
2017-01-16 19:26:52 -08:00
Ms2ger 720fdf561d servo: Merge #15044 - Remove the dependency on the num crate (from servo:remove-num); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2fa4df8ae8cd6f90bbd86b71bfd8b9f582eb3751
2017-01-16 14:51:33 -08:00
Emilio Cobos Álvarez 706baa3dd4 servo: Merge #15018 - gfx: Use proper freetype bindings (from emilio:freetype); r=jdm
<!-- Please describe your changes on the following line: -->

Needs https://github.com/servo/rust-freetype/pull/48, and https://github.com/servo/webrender/pull/716

Source-Repo: https://github.com/servo/servo
Source-Revision: c8c38249a3ee38e72e4a427b05ab96b95d08f8fa
2017-01-16 13:01:59 -08:00
Ms2ger 560ad3ebfb servo: Merge #15042 - Update regex (from servo:update-regex); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bb540cab632593841611ad470c87d2093af75158
2017-01-16 05:59:18 -08:00
Ms2ger ab86fac4da servo: Merge #15041 - Update js (from servo:update-js); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 9cd1b861ecfe73e135c4e2b3574860db71b905f7
2017-01-16 02:24:06 -08:00
Glenn Watson 6a852c3dac servo: Merge #15030 - Update WR (version bump, mac fix) (from glennw:update-wr-mac); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: 747e130295bc6dce8448a69bfdb01d2216f71738
2017-01-15 09:42:26 -08:00
Fabrice Desré bd0b6a2290 servo: Merge #15003 - Update browser.html to pick up the fix in browserhtml/browserhtml#1263 (from fabricedesre:update-browserhtml); r=jdm
<!-- Please describe your changes on the following line: -->
This is the result of running `cargo update -p browserhtml` to pick up the fix for issue #14919

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X ] `./mach build -d` does not report any errors
- [X ] `./mach test-tidy` does not report any errors
- [X ] These changes fix #14919 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because there are no reftests for b.html

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: e6736d067c80fe8613b1882814d596ba1323b870
2017-01-12 22:44:00 -08:00
Ms2ger b8ed186412 servo: Merge #14983 - Update js (from servo:update-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 550df86ac88ff12ad3964d08b6a678ae0d1b4436
2017-01-12 07:48:13 -08:00
Glenn Watson c8d066971a servo: Merge #14977 - Update WR (shutdown api, clip mask segment optimization, render target sizing) (from glennw:wr-update-1); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: 88f02b30824b5ba0be82b0856042e24cad2eb725
2017-01-12 01:28:35 -08:00
Manish Goregaokar f2812e688c servo: Merge #13972 - ImageMaps: Implemented support for parsing coord attribute to a shape… (from shravan-achar:master); r=Manishearth,emilio,jdm
<!-- Please describe your changes on the following line: -->

Image Maps: (Part 1) Implemented support for parsing coord attribute to a shape object.
                       Implemented a hit_test method to see if a point is within the area. Tests for constructors                      and hit_test included

---

<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

… object in HTMLAreaElement

Source-Repo: https://github.com/servo/servo
Source-Revision: f6940f686cce249626e4fe32cc0fe5e0dcd40dd6
2017-01-11 12:25:46 -08:00
Ms2ger c4c86ad9c1 servo: Merge #14961 - Move DevicePixel to script_traits (from Ms2ger:DevicePixel); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 5d3847dddc9bb7907abfa5d38a7927d6c656fbc1
2017-01-11 11:31:15 -08:00
Ms2ger 4cb0c1862f servo: Merge #14929 - Update image (from servo:update-image); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 12c71c57d178ee5bfd383063ddebb4763006eaf4
2017-01-11 05:37:45 -08:00
Ms2ger 25854451c6 servo: Merge #14938 - Various cleanup around gfx_traits (from servo:gfx-traits); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: f674a9db8b7164dae667875c5cf19b3aabb18ef2
2017-01-10 07:02:23 -08:00
Glenn Watson 63fc85cd4b servo: Merge #14933 - Update WR (external events, nested clips bug, non-square texture pages) (from glennw:update-wr-pages); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0246671312a4b5d0ff7c4b538ba0e1ec832b0059
2017-01-10 01:54:46 -08:00
Glenn Watson ce12233751 servo: Merge #14818 - Update WR (first phase of z-buffer optimizations / improvements) (from glennw:zb); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 851d6230f3836dccdad932d553488c2420b4dbb3
2017-01-09 11:56:40 -08:00
Imanol Fernandez 952fe5d9e8 servo: Merge #14618 - WebVR API Implementation (from MortimerGoro:webvr_api); r=larsbergstrom,emilio,jdm,nox,asajeffrey,cvan
<!-- Please describe your changes on the following line: -->

WebVR API Implementation with HTC Vive support on Windows. The current implementations only enables the WebVR support on Windows. In other platforms the API is available on JavaScript but navigator.vr.getDisplays() returns an empty array. This will change when we add support for more VR providers and platforms ;)

Info about the architecture:
https://blog.mozvr.com/webvr-servo-architecture-and-latency-optimizations/
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

Proprietary openvr.dll must be copied next to servo.exe in order to test on HTC Vive (https://github.com/ValveSoftware/openvr/tree/master/bin/win64) I have added some of the official WebVR samples for testing. Switch on your headset and run:

mach run tests/html/webvr/room-scale.html

Source-Repo: https://github.com/servo/servo
Source-Revision: 518ef39cfd429082dd8dc0d5b13e2db637d08a53
2017-01-09 06:39:45 -08:00
Cameron McCormack a36ca4a02b servo: Merge #14923 - Update cssparser to 0.7.2 (from heycam:cssparser-up); r=nox
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 13826970c4d9fbbd67cdf9dfb39e8a847cf06541
2017-01-09 00:58:19 -08:00
mrnayak ad30e3c8d0 servo: Merge #14865 - Implement Subresource Integrity (from mrnayak:sri-fetch); r=jdm
Implemented response validation part of https://w3c.github.io/webappsec-subresource-integrity/.
Implemented step eighteen of the main fetch. If a request has integrity metadata, then following steps are performed
1) Wait for response body
2) If the response does not have a termination reason and response does not match request’s integrity metadata, set response and internalResponse to a network error.

Dependency updated: html5ever-atoms from 0.1.2 to 0.1.3. This will not completely fix #14523, It will implement changes related to response validation. Request validation algorithm implementation needs CSP.

I did not update any WPT-Test. In my local system, I found some assertion issue dependent on the order of execution of test-case. It would be helpful if someone could do "try" build on these changes to get wpt results.

r? @jdm
<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [X] There are tests for these changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: f958dafcaeed643f1232a23f5c2d4f6ba141bfea
2017-01-07 23:14:37 -08:00
Anthony Ramine a8ae8f9091 servo: Merge #14867 - Properly insert text in document when parsing (from nox:a-base-de-popopopop); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f313e8baffe5a41d839c3e0de28e8cd6e7a4773a
2017-01-07 10:57:36 -08:00
Matt Brubeck f0128374f5 servo: Merge #14874 - Update url, num_cpus, heapsize, webdriver (from mbrubeck:always-be-updating); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 3b2a066088491743ddc6900c01ac59726d8927d8
2017-01-06 23:34:20 -08:00
Josh Holmer 2862f2990e servo: Merge #14871 - Use tinyfiledialogs from crates.io (from shssoichiro:14862-tinyfiledialogs-from-crates-io); r=jdm
Use the crates.io version of tinyfiledialogs instead of pulling directly from the git repository.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14862 (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because no code was changed

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 94d62a2afbbbb08d0225dd45fd8a8480d4bdf98d
2017-01-05 22:49:19 -08:00
Alan Jeffrey 94a31a8931 servo: Merge #14351 - An in-memory RNG that shares its file descriptor (from asajeffrey:servo-rand-share-fds); r=emilio
<!-- Please describe your changes on the following line: -->

This PR implements an in-memory random number generator that only uses an OS RNG for (re)seeding. The OS RNG is shared, so there's only one file descriptor for `/dev/urandom` being used.

The PR also implements a tidy check that we don't accidentally introduce an RNG. Rather annoyingly, there are a lot of transitive dependencies on `rand`, notably hash maps in `std`.

This PR makes it possible to use uuids for identifiers such as pipeline and frame ids.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because it's fixing a resource issue

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 36ddf763f66b1b971db07649ff5c69b2e9fd5f91
2017-01-05 06:32:23 -08:00
Bobby Holley b830eea173 servo: Merge #14835 - Switch to crates.io for atomic_refcell (from bholley:external_atomic_refcell); r=Manishearth
r? @Manishearth

See #14828 for backstory.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1e927ca88bf6622d5a87db75863f76976a1df56c
2017-01-03 19:20:59 -08:00
Xidorn Quan 97376dcc30 servo: Merge #14768 - Upgrade libbindgen to 0.1.5 (from upsuper:upgrade-bindgen); r=emilio
0.1.4 is known to be broken on Windows, and earlier version may not work properly in various platforms.

r? @emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: ab623de2617c5a5414f4a0ac7cd66627214f82d5
2016-12-29 04:49:16 -08:00
deror1869107 4cc00f2dc6 servo: Merge #14730 - Rewrite Crypto::GetRandomValues to use typed array API (from deror1869107:typed_array_API); r=emilio
<!-- Please describe your changes on the following line: -->
Rewrite Crypto::GetRandomValues to use typed array API

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [X] These changes fix #14673  (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 1c60a5bef84a709491882e22d4e3393de062dea9
2016-12-25 23:37:15 -08:00
Roman Zaynetdinov f459203bbf servo: Merge #14726 - Remove azure(canvas) dependency from canvas_traits (from zaynetro:no-azure-in-canvas_traits); r=SimonSapin
<!-- Please describe your changes on the following line: -->

Remove azure (canvas crate) dependency from canvas_traits crate.

There might be some tests that are failing due to changed implementation location. I will take a look at this pull request build status.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14108

<!-- Either: -->
- [x] These changes do not require tests because no methods were modified or moved

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 32281030149a9e40d46310de0025a8f522798f21
2016-12-25 09:56:32 -08:00
Emilio Cobos Álvarez 430bf9b256 servo: Merge #14721 - Bindgenup (from emilio:bindgenup); r=Manishearth
<!-- Please describe your changes on the following line: -->
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 75b3d68fa74ae1b9a090a6dc13dec3b8dca67b89
2016-12-24 16:43:57 -08:00
Ulf Nilsson 0a58c8a1e4 servo: Merge #14708 - Update jpeg-decoder to 0.1.10 and disallow duplicate rayon versions again (from kaksmet:update-jpeg-decoder); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c25265273c012a1ecf371fb7b459c53486cb9024
2016-12-24 10:43:02 -08:00
Ms2ger 91bb17a5b5 servo: Merge #14687 - Update various crates (from servo:always-be-updating); r=emilio
Fixes #14681.

Source-Repo: https://github.com/servo/servo
Source-Revision: 29901b187bb93837ebd2f9a641c7bf1866566a95
2016-12-24 04:37:12 -08:00
Glenn Watson f28c7a9ed7 servo: Merge #14668 - Update WR (windows font fixes, ridge/groove borders, scrolling improvements) (from glennw:update-wr-dwrote); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e80965f17362f5428d0b77ab1511e087611281fe
2016-12-24 01:55:17 -08:00
Manish Goregaokar a02e4aabea servo: Merge #14684 - Regen bindings (from Manishearth:regen); r=bholley
Source-Repo: https://github.com/servo/servo
Source-Revision: dd2aa4195ab1ac853a5b80c6aa0a0d9c1fae055c
2016-12-22 23:26:57 -08:00
Simon Sapin 99a67d7521 servo: Merge #14671 - Remove the unused dependency of style to plugins (from servo:style-no-plugins); r=mbrubeck
<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 40527441395622dff6b970d6ff1f9f6503f54567
2016-12-22 12:53:33 -08:00
Ms2ger bcc82d495e servo: Merge #14633 - Update Rust to 1.15.0-nightly (71c06a56a 2016-12-18) (from servo:rustup); r=SimonSapin,nox
Source-Repo: https://github.com/servo/servo
Source-Revision: df667f16b07e78fef50767c0d6912a8c2318225d
2016-12-21 16:24:27 -08:00
Bobby Holley 8eb98de31a servo: Merge #14642 - Use Scoped TLS in the style system and eliminate UnsafeNode usage in the StyleSharingCandidateCache (from bholley:scoped_tls); r=emilio
See the discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=1323372

@emilio Please review, but don't merge yet until we get the upstream changes into Rayon.

CC @SimonSapin @heycam @upsuper @Manishearth @pcwalton @nikomatsakis

Source-Repo: https://github.com/servo/servo
Source-Revision: 8fd8d6161426af386c0dfd3d13968a409474eb16
2016-12-21 11:11:12 -08:00
Ms2ger c051a68495 servo: Merge #14658 - Separate the async bluetooth handling from networking code (from servo:bluetooth-net); r=jdm
They're not at all related, besides both being asynchronous. This change adds
a little extra code in response_async(), but makes this code more readable
and reduces the unnecessary indirection.

This change also makes the build system slightly more parallel, by dropping
the dependency on bluetooth_traits from net_traits.

Source-Repo: https://github.com/servo/servo
Source-Revision: fb457723e80d6a2300c499ffa402aa7eaeb877fd
2016-12-21 06:47:33 -08:00
Michael Howell 435fd8474a servo: Merge #14652 - Update to quickersort 2.2 (from servo:always_be_updating); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 50c9311c3a7a4a151692fc89a6d239b5e006fee3
2016-12-21 04:13:06 -08:00
Glenn Watson ad22cfd458 servo: Merge #14650 - Update WR (shader cast errors on android) (from glennw:update-wr-shader-casts); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: 0aa1fc5efe07d9fb87e996644b612c4c3ba9d132
2016-12-20 11:58:57 -08:00
Lars Bergstrom c6abe8b404 servo: Merge #14629 - Revert "Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15)." (from larsbergstrom:revert_rustup); r=nox
This reverts commit 5618e797683e7bfc400e8b1879d89f64bfb577fa.

<!-- Please describe your changes on the following line: -->
According to @nox, this breaks MacOS. Should be fine tomorrow:
rust-lang/rust#38430

r? @nox @Ms2ger (or whomever)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: d918c1424783dedb8bb7f9dcbba00b8fcc0b0254
2016-12-19 06:33:09 -08:00
Ms2ger 27996b5590 servo: Merge #14481 - Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15) (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 077a54de19ad6336cc6fae5fb4d9897535f67c2b
2016-12-19 03:58:56 -08:00
Emilio Cobos Álvarez a5eb28d500 servo: Merge #14485 - style: Add a simple rule-tree benchmarks (from servo:rule-tree-bench); r=heycam
<!-- Please describe your changes on the following line: -->

r? @heycam

Numbers on my machine, for the record:

```
test rule_tree::bench::bench_expensive_insersion          ... bench:   7,211,081 ns/iter (+/- 1,933,866)
test rule_tree::bench::bench_expensive_insersion_parallel ... bench:  78,728,097 ns/iter (+/- 11,738,010)
test rule_tree::bench::bench_insertion_basic              ... bench:     665,333 ns/iter (+/- 68,089)
test rule_tree::bench::bench_insertion_basic_parallel     ... bench:   1,587,203 ns/iter (+/- 372,124)
```

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

--HG--
rename : servo/components/style/servo/mod.rs => servo/tests/unit/style/rule_tree/mod.rs
2016-12-19 00:47:34 -08:00
Glenn Watson 1e1fe337f9 servo: Merge #14412 - Update WR + gleam (nested clip stack, scroll locations) (from glennw:update-wr-clip-2); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: bffac0f55ea5dd9a19eaf7b5acc85d08f43055d3
2016-12-14 18:46:25 -08:00