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

261 Коммитов

Автор SHA1 Сообщение Дата
Simon Sapin fd16ec7749 servo: Merge #16689 - Upgrade to html5ever 0.16 (from servo:m5e); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 8b41c7c137c78aab208fe2991c3ec951fe5f1386

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 234eca73c03f9e482a94c97e49ce5a78d077123e
2017-05-03 08:42:41 -05:00
Glenn Watson 92c09fc43d servo: Merge #16684 - Update WR (new dashed borders, basic preserve-3d support) (from glennw:update-wr-dash-xforms); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 49e055264d6258139a6a17a5d77653bebfb04e80

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 8ef6e8e99cab137fd068cc03006c4ee977a1232d
2017-05-01 23:02:02 -05:00
Matt Brubeck 8953bcba61 servo: Merge #16677 - Update dependencies to latest compatible versions (from mbrubeck:always-be-updating); r=jdm
Cargo.lock changes only, does not affect stylo.  One new dependency because `brotli` split into two crates.

---
- [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 they touch Cargo.lock only

Source-Repo: https://github.com/servo/servo
Source-Revision: 487da47ea4f46a480fbc2da985a05f0fa7953e99

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9352629a943a762d7a8f62cac4c136e09cc1d87a
2017-05-01 12:38:22 -05:00
Emilio Cobos Álvarez e5cd6e8c74 servo: Merge #16661 - style: Use SmallVec more in the style system (from emilio:alloc); r=bholley
I expect this to improve the situation significantly in https://bugzilla.mozilla.org/show_bug.cgi?id=1360881

This is worth doing on its own, though.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6b7ac9715c8e33c3138d1f29a42c0e61b96db453
2017-04-30 16:33:23 -05:00
Glenn Watson 129c0894f4 servo: Merge #16643 - Update WR (various bits and pieces) (from glennw:update-wr-bits-and-pieces); r=jdm
* Split out positioning and clipping per display item.
* Only send scroll states for clips that actually scroll.
* NV12 texture format support.
* Make dithering a feature.
* Handle radial gradients with invalid radii.

Source-Repo: https://github.com/servo/servo
Source-Revision: 86bc2c02056d27435b2ceb6ab40736979c800d3e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c843193d947d1ae013855438b80ca5c2e1711f04
2017-04-28 08:52:10 -05:00
Glenn Watson 9cb9e8157a servo: Merge #16612 - Update WR (groove/ridge borders, mix-blend-mode opts) (from glennw:update-wr-groove-ridge-2); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c1b347794cc9812bf608fdc267c4c0e4ef5ef968

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 838486b2f323b419e11b991e511397037f61bb65
2017-04-26 07:56:32 -05:00
Keith Yeung 0cbde992bb servo: Merge #16600 - Update rust-mozjs (from KiChjang:update-rust-mozjs); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: c5c6e8c442eb670093561af85c7606262a0f7318

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e9ced8d4bc0e4699d9d27ad3917206c84eae0850
2017-04-25 01:51:11 -05:00
Simon Sapin c23b19c46c servo: Merge #16589 - Update to cssparser 0.13 (from servo:cssparserup); r=emilio
https://github.com/servo/rust-cssparser/pull/140

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4021fd2840923dfe8b3f5496968319341d1abe9e
2017-04-24 18:47:00 -05:00
Simon Sapin ea7e4c095b servo: Merge #16579 - Upgrade to rustc 1.18.0-nightly (23de823e9 2017-04-23) (from servo:rustup); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 70d7a2be3429196e82c877c5f63cdbf748df6c18

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 74a7fd6028e1873a500a229f69918a7fad851242
2017-04-24 06:09:25 -05:00
Glenn Watson 6cad41ac46 servo: Merge #16551 - Update WR (improved double border quality, minor API changes) (from glennw:update-wr-mostly-borders); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0f6c883658930006994b2738f059d050c037ffb9

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5a2b967824253fe8b67619ee1e323b5d2dac7e4f
2017-04-23 17:50:08 -05:00
Imanol Fernandez cda127d899 servo: Merge #15773 - Android life cycle improvements and Gradle integration (from MortimerGoro:android_improvements); r=larsbergstrom,fabricedesre
This PR includes Android life cycle Improvements and Gradle integration for android packaging.

Android life cycle improvements are implemented in both the new [MainActivity](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-f43708b102e98272c2af7454b8846927) and native code in this related PR: https://github.com/servo/glutin/pull/117
- Properly handle the life cycle of the Android Activity: manage EGLContext lost & restore, and animation loop pause/resume when the app goes to background/foreground or orientation changes. In the current upstream Servo crashes when the app goes to background, activity stops or changes orientation
- Handle event loop awake for Servo Animation loop
- Handle screen resize & orientation events
- Implement new keep_screen_on preference which keeps Android device's screen from ever going to sleep: very useful for games or WebVR
- Implement a full screen mode enabled by preference: very useful for games or WebVR
- Implement new shell.native-orientation preference which allows to lock the Activity to a specific orientation
- Automatically sync new android assets to sdcard when the Android version code is changed.  In the current upstream only the existence of the folder is check but resources are not updated

ofscreen_gl_context is updated to fix this: https://github.com/emilio/rust-offscreen-rendering-context/pull/83

This PR integrates Gradle build system for android packaging. Most of the code is implemented in this [build.gradle](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-89cdb9324addb994cdba0a158b209547) . We can get rid of [build-apk](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-40f5a7cf22f94aad059b2c1795347f5e) and manual jar dependency copying in the [package_commands.py](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-0d425b142c8d10ae6ac1f3711fb5c23a). The correct version of gradle is automatically downloaded using the gradlew wrapper.

Some improvements:
- Allows to include more complex android dependencies/SDKs like AARs, manifest auto-merging and more.
- Improved packaging process: The gradle project is always in the same folder, it uses relative paths for everything (assets, native libraries) and outputs the apk into the correct target folder in servo. In the current upstream, ant/python build system copies the manifest, project, resources and jars each time so you end with multiple copies of the same files.
- Improved dependency declaration. We do not have to manually copy jar dependencies in the python script anymore. The gradle build scripts itself is able to search for the dependencies in the correct servo target folder.
- Supports packaging apks with different architectures: armeabi, armeabi-v7a, aarch64. We still need to fix some native servo compilation issues with armeabi-v7a, aarch64 due to dependencies which use `make`. I'll push this changes in a separate PR of the python build files but the gradle file is already ready to handle that.
- We can easily create product flavors for different versions of Servo. For example a default browser, a WebVR browser with additional dependencies or a Servo android Webview component
- Fixes minor.major.52 build error when blurdroid cargo dependency is compiled using java8 (the default in new Linux machines). The gradle build file enables the new Jack compiler which supports Java8 dependencies.
- The project can be opened with Android Studio and run the brand new GPU debugger on any Android phone. I'll add some docs in the Wiki about this.

---
<!-- 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 #14568 (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: 2b5c17c43a517b6d6bd981f5fa905536dddd3beb

--HG--
rename : servo/support/android/apk/AndroidManifest.xml => servo/support/android/apk/app/src/main/AndroidManifest.xml
rename : servo/support/android/apk/res/mipmap/servo.png => servo/support/android/apk/app/src/main/res/mipmap/servo.png
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2da8cf56223c150832fddb3e8878432f4d64bc6e
2017-04-21 15:52:13 -05:00
Martin Robinson b35beae16d servo: Merge #16531 - Eliminate ScrollRootId (from mrobinson:clip-id); r=glennw
Just use WebRender's ClipId directly. This will allow us to create and
use ReferenceFrames in the future, if we need to do that. It will also
make it easier to have Servo responsible for creating the root
scrolling area, which will allow removing some old hacks in the future.

<!-- 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
- [x] These changes do not require tests because they should not change behavior.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 6e05a903afe81af5a45067dde4f9af26a2ea4be2

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ed3c05a3a6ad1de7c189632886473e8b9b294565
2017-04-20 01:55:33 -05:00
Glenn Watson fd28092af0 servo: Merge #16523 - Update WR (driver workaround, large clip mask fix, font index support) (from glennw:update-wr-drivers); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 0a54d5a025a78ec4325639d6ffb1dfc1f0ac78ac

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 73913c834b6e03a31ad011f7cb9e17583ea80d44
2017-04-19 04:53:22 -05:00
Glenn Watson b254d008cd servo: Merge #16502 - Update WR (IPC profiling, RG8 image support) (from glennw:update-wr-ipc); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 56435db820ad13d7fcb9acf9ce4fa84667234706

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5f2d5a0dbb8c32ee2d18cd77fb640c9f8ec83ee6
2017-04-17 17:18:23 -05:00
Imanol Fernandez 72a0aed474 servo: Merge #16499 - Update servo-glutin (from MortimerGoro:update_glutin); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->

Update servo-glutin to include this PR: https://github.com/servo/glutin/pull/121

---
<!-- 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 _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 656cc1531fac155f4d6e0cbc14ef9ad65dc2d83d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d65a4bc470e89b98a13b61b3abd43a34cebbdc89
2017-04-17 14:44:27 -05:00
Matthew 597d87dc54 servo: Merge #16347 - Removing recursion from ComplexSelector (from tictakk:ticbranch); r=emilio
<!-- Please describe your changes on the following line: -->
Using a smallvec instead of recursively calling to_css for ComplexSelector to handle running out of stack.

---
<!-- 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 #16019  (github issue number if applicable).

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: fd89ddf4bba2ff7f53842332f0651f45620c494b

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1301f611a72e8fa25126aecdf5d2241494e88d64
2017-04-16 21:02:06 -05:00
Martin Robinson 022e2958a8 servo: Merge #16452 - Update to latest version of WebRender (from mrobinson:update-wr); r=jdm
This should bring in some fixes for clipping of nested scroll layers.

<!-- 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
- [x] These changes do not require tests because the WebRender fixes are necessary for a future PR, but we don't expose the bug currently.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 0471adf36bb6f4c948790d2a4fd3023f2532202a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b08656783865619431fe25219fd007812d6dac86
2017-04-14 13:52:22 -05:00
Glenn Watson 160140c3c8 servo: Merge #16398 - Update WR (new border code path) (from glennw:update-wr-elliptical-borders-aa); r=mrobinson
This includes the new border code path for simple (solid) borders.
This gives much higher quality border rendering, including proper
support for elliptical border segments.

The quality on https://github.com/servo/servo is noticeably improved.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b75b007cf793fd2a258ddd69195795acc6e11aad
2017-04-14 00:42:49 -05:00
Imanol Fernandez 975fde609c servo: Merge #16260 - Gamepad API implementation (from MortimerGoro:gamepad); r=nox,larsbergstrom
<!-- Please describe your changes on the following line: -->

Gamepad API implementation. Tested with HTC Vive and Daydream controllers ;)

---
<!-- 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 #10977

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because : current gamepad tests are manual (https://github.com/w3c/web-platform-tests/tree/master/gamepad). There is a  open issue about the best way to test WebVR/Gamepad without real devices https://github.com/w3c/webvr/issues/187. We'll work on the testing suite & mock devices/data on a separate issue.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 26c45275ffaccf746e47606a74b3aee519673e54

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5ae2853a5fc26b6a0fedc0cbb9b3eef9e6ad6049
2017-04-13 16:10:42 -05:00
Glenn Watson a13789a4c4 servo: Merge #16360 - Update WR (gradients, batching, text run, border changes) (from glennw:update-wr-borders); r=jdm
- Tidy and optimize the batching code.
- Support tiling / repeat for linear and radial gradients.
- Fix some edge cases of subpixel text AA.
- Add clip mask support to border shaders.
- Optimization to text run creation on CPU.
- Handle more box-shadow clipping cases.
- Fix a panic that could occur when window size is 0.
- Clip / scroll API improvements.

Source-Repo: https://github.com/servo/servo
Source-Revision: 43bd0cae0d983ec1e78c82fcebea303f2854cb85

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : dcefa625b08187b0dcf7f729626d052c84a40fd4
2017-04-12 12:03:10 -05:00
Clement Miao 09700df61d servo: Merge #15666 - added keyboard shortcuts for navigation inside text box (from clementmiao:keyboard_shortcuts); r=asajeffrey
PR to implement keyboard shortcuts per issue #12278, r? jdm

Thanks for letting me help!
---
<!-- 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 #12278 (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: 45f20f0bd65ed9ed6f0183703a73740dae9c4af3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 996825b5213d9f998dda31ed5688be1badc8c380
2017-04-12 03:01:16 -05:00
Bobby Holley 206fa732a5 servo: Merge #16358 - Fix up the style sharing cache (from bholley:style_sharing_fixes); r=emilio
Reviewed in:
https://bugzilla.mozilla.org/show_bug.cgi?id=1354895
https://bugzilla.mozilla.org/show_bug.cgi?id=1332525

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ba3f1e4f3064ec3054b2346062758375b8ab117

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ea1494fe9e1c0720730f3999a0c11bd0b3434617
2017-04-11 22:52:23 -05:00
Ahmed Charles 82d3daa682 servo: Merge #16306 - Update Cargo.lock to include fix for MSVC 2017 in mozjs-sys (from ahmedcharles:msvc); r=Wafflespeanut
<!-- 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] These changes do not require tests because it just updates to a new version of spidermonkey.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 63988b910357fd7180819c46a4585f9d0138c42c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 60c87fbfa84f74d80694ed912648c980e6bc15cf
2017-04-08 05:11:01 -05:00
Emilio Cobos Álvarez ef539fe318 servo: Merge #16070 - selectors: Get rid of hashing overhead using the precomputed hash atoms have (from emilio:selectors-bloom-hash-less); r=bholley
I realized of this when @bzbarsky  mentioned the bloom filter in https://bugzilla.mozilla.org/show_bug.cgi?id=1348935#c7.

Right now we hash (the hash) all the time, when we can do better.

This requires a change in string-cache, which is at https://github.com/servo/string-cache/pull/183.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a84fb1b7a5ccab19ecfa8bb57499719f881fd1c1
2017-04-07 19:03:12 -05:00
Emilio Cobos Álvarez 5dd98d6e14 servo: Merge #16301 - Update string-cache (from emilio:atoms-up); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: e0731215c0e712d792ea64a709c5178cb2cab165

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 8201e5beb53bff8058fca4f67cec8c87c410d430
2017-04-07 06:40:45 -05:00
Connor Brewster 7d9ab3927e servo: Merge #16037 - Reduce cloning of FrameState (from cbrewster:reduce_framestate_clones); r=asajeffrey
<!-- Please describe your changes on the following line: -->
This uses `kmerge` from itertools to construct the jsh future and past iterators without having to do a collect/sort. This allows us to reduce cloning of `FrameState`.

---
<!-- 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
- [X] These changes do not require tests because refactoring

<!-- 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: c87d0c671c2ae20a97099f3f369e81eb0ce5e403

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 43070ae1b6bc62aa2af1f0e07c74688a841b11e2
2017-04-06 21:22:14 -05:00
Xidorn Quan d7042054d2 servo: Merge #16282 - Move dummy url data to be a static member of URLExtraData (from upsuper:bug1343964); r=heycam
This is the Servo side change of [bug 1343964](https://bugzilla.mozilla.org/show_bug.cgi?id=1343964) which has been reviewed on Bugzilla.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9ad95a5dc74455c52233963fba4fb31324c40847

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2d135f6e480fc2e1ff0b820ec4c4211465de5415
2017-04-06 19:33:35 -05:00
Glenn Watson c9cbf5cefa servo: Merge #16279 - Update WR (inset box shadow + border-radius + clip) (from glennw:update-wr-inset-box-shadow-clip); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 21eafebd37bd90b2240ec156c0cc714434b89595

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e986288ed9824fce20fdd6a1b67c15c8a23e3915
2017-04-06 06:27:50 -05:00
Josh Matthews 3e783d5156 servo: Merge #15784 - Make SSL tests work (from jdm:ssltests); r=nox,jgraham
These changes fix #6919.

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

--HG--
rename : servo/components/net_traits/hosts.rs => servo/components/net/hosts.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e60490550b246691c170ea0b0c856db33b7dbf61
2017-04-06 05:53:14 -05:00
Glenn Watson 341d05c4ee servo: Merge #16264 - Update WR (border fast paths, clip interfaces) (from glennw:update-wr-borders-and-clips); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 6a67688924b1b122be9c8ec456d6029dc02366a4

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 88b484524f996cce0d5c77dfd7e3634684cdb6da
2017-04-04 20:35:19 -05:00
Glenn Watson 0cd4c685d5 servo: Merge #16252 - Update WR (gradient features) (from glennw:update-wr-gra); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 41e712786e6d618e83a0988d43436d6e5e5bb36e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4f7e0b2cfd0aaad9496ef12290861b20fc9214b5
2017-04-04 14:41:41 -05:00
Simon Sapin 8769d0227e servo: Merge #16246 - Revert to per-process shared lock for author-origin stylesheets (from servo:revert-per-doc); r=jdm
Fixes https://github.com/servo/servo/issues/16097
Reopens https://github.com/servo/servo/issues/16027

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c8b45f3883847d325c30ab9a95193a8eb530bc5c
2017-04-03 16:16:07 -05:00
Imanol Fernandez 7c55171e04 servo: Merge #16237 - Fix Android issues: update servo-glutin & offscreen_gl_context (from MortimerGoro:update_glutin_offscreen); r=jdm
<!-- Please describe your changes on the following line: -->
See https://github.com/emilio/rust-offscreen-rendering-context/pull/94 and https://github.com/servo/glutin/pull/121

---
<!-- 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 _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: f659d43bd403e4ac1305990ba704f23b4a6cd5e6

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 76e38ca77cc9227bfaa6f30cc6445cdfcbacf29c
2017-04-03 14:38:48 -05:00
Xidorn Quan 73064eb8b6 servo: Merge #16241 - Stop passing url as string into Servo side (from upsuper:bug1352763-bug1352025); r=Manishearth,emilio
This is the Servo side changes of [bug 1352763](https://bugzilla.mozilla.org/show_bug.cgi?id=1352763) and [bug 1352025](https://bugzilla.mozilla.org/show_bug.cgi?id=1352025) which have been reviewed on Bugzilla.

Source-Repo: https://github.com/servo/servo
Source-Revision: 679b41893782663f7a2294cdf94dcedcf1337f98

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 135f4003dbf47eab0842f02be2aa9f766e066721
2017-04-03 07:05:42 -05:00
Glenn Watson 5ad8c3136c servo: Merge #16200 - Update WR (various optimizations, gradient improvements) (from glennw:update-wr-clear-opts); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: e45d7e0e2e5d47945d3d821db5767feff64d7634

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d1a41f20df61036023a26584e0f3fba726a3d506
2017-04-02 17:05:01 -05:00
Josh Matthews 2fe0ff60e5 servo: Merge #16223 - Update xml5ever (from jdm:xml5everup); r=SimonSapin
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #16213

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 519eff56b93db10257e710eda875a579b3beeea6
2017-04-01 09:30:39 -05:00
Josh Matthews 34cad3c4fd servo: Merge #16210 - Update rust-mozjs to master (from jdm:updatejs); r=Wafflespeanut
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #16152
- [X] There are tests for these changes

Source-Repo: https://github.com/servo/servo
Source-Revision: 2ebddca5921230eafc25acaa5bf47c10756f3e51

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : de6f1ce0d879dbb173e8ae29b4d0572f3b1e278f
2017-04-01 00:05:56 -05:00
ddh b6b120e23d servo: Merge #15868 - Update Hyper and OpenSSL (from servo:hyper); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 82b0d5ad54d94a29f595d59cbb37dcbab5d5a5c8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cda703ae221b029588bdb549a69b150e1397ca3a
2017-03-31 11:46:09 -05:00
Anthony Ramine ca633f20db servo: Merge #16180 - Make the WebSocket handshake ourselves 🍷 (from nox:tungstenite); r=jdm
HYPE

Source-Repo: https://github.com/servo/servo
Source-Revision: 76a2c9705a34d651a11caac98b4b023c79657368

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0c635586594e4c0a39544cfbc4a685974a51c7e4
2017-03-29 12:55:38 -05:00
Jeremy Chen 1a65c22c50 servo: Merge #16155 - stylo: Implement gecko glue for font-language-override (from chenpighead:gecko-glue-for-font-language-override); r=emilio
To be aligned with the implementation from Gecko side, we parse
font-language-override as Normal keyword or String. Then, we compute
and store it as a u32. So, as to the stylo glue, we can just pass the
u32 to Gecko.

The extra crate, byteorder, is used to simplify the computing and
serialization.

Since we now implement font-language-override for Gecko, we can remove
the additional branches for font-language-override in font shorthand.

ref: Gecko [Bug 1347821](https://bugzilla.mozilla.org/show_bug.cgi?id=1347821)

<!-- 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 _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: af243d5decde5663e2f6558eaa78c9022536c289

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a8af7077c4c7d662923ae8ccc854e06b53c590ea
2017-03-28 15:05:33 -05:00
Matt Brubeck 6c73564284 servo: Merge #16098 - Upgrade dependencies with patch updates (from mbrubeck:always-be-updating); r=Wafflespeanut
Cargo.lock version bumps only. Does not affect stylo. No new crates in the dependency graph.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1cc587a767a2e3e00d0bd1b400bda2c21af4e075

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9c1c634530a4f234297cb8894ff4c528b6d90aa1
2017-03-28 12:45:19 -05:00
Fernando Jiménez Moreno b7749d2ddf servo: Merge #16048 - Make image cache per-document rather than global (from ferjm:issue-15701-image-cache); r=jdm
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15701.
- [X] These changes do not require new tests because there should already be WPTs for image loads.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 795b94666dc18a53ce2d75ef1a5279c76e04a3c7
2017-03-27 13:50:46 -07:00
Glenn Watson ec4e11d887 servo: Merge #16113 - Update WR (opaque rect optimization, stacking context culling) (from glennw:update-wr-opaque-opt); r=mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: 3b79bc25825ea416298b1917e0bd409b7044f837

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : becb4839ec630c1b8d5d59c6f14655def789c5ab
2017-03-26 14:04:07 -07:00
Anthony Ramine d0e7f70a9b servo: Merge #16137 - Replace use of rustc_serialize::base64 by base64 (from nox:die-rustc-serialize-die); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: d992442dc6bb0b0c006b516c36ef4c6664e6b74c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 75532b20415e21fbb1b16a599ca14a6ba9a72882
2017-03-26 12:23:17 -07:00
Anthony Ramine 7addc89506 servo: Merge #16116 - Remove some useless thread spawning in websocket_loader (from nox:tungstenite); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f10d510bd14b19badbd0c4a5f912b044cdfe890

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2423a5b04f7ed402de6fe178f764dc1a6ddd5be3
2017-03-24 04:48:07 -07:00
Anthony Ramine 4bac578b9d servo: Merge #16114 - Only pass the protocol in use in to establish a WS connection (from nox:tungstenite); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: bfd2aab71e61d4d71a42211e16789cf3a13c914c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : acf84805957baef4fb9816eb16896913d935d181
2017-03-24 03:10:50 -07:00
Glenn Watson 7ddc788706 servo: Merge #16073 - Update WR (gl trait, scroll roots) (from glennw:update-wr-glfns); r=mrobinson
Source-Repo: https://github.com/servo/servo
Source-Revision: c99289a928b30c874da2aa4d8aa869593bbb5e14

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e963ce4fd8a3773dcd502808b89894a0d1755c07
2017-03-23 03:43:49 -07:00
Matt Brubeck ae1873f96c servo: Merge #16088 - Update parking_lot_core and smallvec (from mbrubeck:always-be-updating); r=emilio
- [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 they update third-party code only

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : acc36452436ba835a639ef32d867d7acbdb61064
2017-03-22 16:21:28 -07:00
Matt Brubeck e4a9fa2dec servo: Merge #16080 - Fix compiler warnings in stylo unit tests (from mbrubeck:warnings); r=Wafflespeanut
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] There are tests for these changes

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d1cad9cfc2bb09c76744dbb9835510f74bd77b49
2017-03-22 09:01:41 -07:00
Manish Goregaokar 43101703b6 servo: Merge #16072 - Fix geckolib breakage caused by 1.16 (from Manishearth:macro-use); r=upsuper
Source-Repo: https://github.com/servo/servo
Source-Revision: f90f7d6824a65eb0b6a266f5e8281f313c1ae1c0

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 53d6fdd5e0b604dfb64cf0cc05c2fe176d005a7b
2017-03-21 22:36:37 -07:00