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

6565 Коммитов

Автор SHA1 Сообщение Дата
mrmiywj 16b0c067fb servo: Merge #11178 - Make Node::BaseURI use the document's base URL (from mrmiywj:use-doc-base-URL); r=nox
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 #11145  (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: d6509dc4c6a1ec0a0c48c0e5a669a93334407f29
2016-05-14 01:12:32 -07:00
Jack Moffitt 808a2917cf servo: Merge #11177 - Update Cargo to 2016-05-12 (from metajack:cargo-up); r=jdm
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 it doesn't affect the code

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: 9e766f4d6eb373ebc2c44550077d47a4c6fc0171
2016-05-13 14:11:08 -07:00
Matt Brubeck ea20c6e89f servo: Merge #11176 - Support z-index in geckolib (from mbrubeck:stylo-zindex); r=bholley
r? @bholley

cc @heycam

Source-Repo: https://github.com/servo/servo
Source-Revision: 21be9e8768903d13945f538fdd42c86095ddf5e6
2016-05-13 11:54:42 -07:00
Connor Imes 90374cd41b servo: Merge #11174 - Update hbs sys dependencies (from connorimes:hbs-sys-021); r=metajack
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 only update dependencies

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: 3990191431f990b94f2d809c31cdac02a3b262be
2016-05-13 09:18:49 -07:00
Ms2ger 6d664715e1 servo: Merge #11173 - Stop using JSAutoRequest (from servo:requests); r=nox
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 no functional change

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: ea84601bf08618254200b3faca055c36e9ff29b4
2016-05-13 06:41:22 -07:00
Emilio Cobos Álvarez 67d95b1def servo: Merge #11155 - codegen: Fix dictionary handling and semantics (from emilio:codegen-dict-keyword); r=Ms2ger
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 #11152 (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.

Fixes #11152

Source-Repo: https://github.com/servo/servo
Source-Revision: 221db56b08e01157c97f5adba43799eeaee32f64
2016-05-13 02:47:08 -07:00
Zaggy1024 d396e5615b servo: Merge #11079 - Changed cursor for labels to "default" so their text doesn't use the text cursor (from Zaggy1024:label-cursor); r=pcwalton
The cursor in Firefox and Chrome for labels is always the default cursor rather than changing to the text cursor on text. In Edge, however, this only applies to the text of the actual label element.

This PR changes Servo to match Firefox and Chrome.

A convenient example of an element that this style applies to (and has different behavior between Firefox and Edge) is the "This repository" label for the search input at the top on Github.

Source-Repo: https://github.com/servo/servo
Source-Revision: 03465ad8c77f03ae2f538d046ae1e1dc86f04723
2016-05-12 19:45:38 -07:00
Emilio Cobos Álvarez 93c0fa9130 servo: Merge #11166 - gfx: Add expect messages to FontCacheThread::exit() (from emilio:fontcache-exit); r=mbrubeck
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 only add debug info.

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

One of these two unwraps is the one that is causing most occurrences
of #8815.

I'd go with removing the second unwrap entirely, but let's get some
debug info first, since it might probably be a race.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e049a85330ebc71212b4629119d561652ac9bef
2016-05-12 16:39:03 -07:00
Matt Brubeck b45c80d3dd servo: Merge #11159 - Fix warnings in unit tests (from mbrubeck:test-warnings); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 1e8ddba3e84617d2e0e01d2e7fbf8548abed518f
2016-05-12 13:12:44 -07:00
Bobby Holley d5ea725805 servo: Merge #11160 - Only use zeroed memory for gecko style structs, not the wrapper servo struct (from bholley:zero_gecko_struct); r=mbrubeck
So that we don't clobber the drop flags.

This is a regression from #11121.

Source-Repo: https://github.com/servo/servo
Source-Revision: c2beb55c0f039d096241d677fb93bfa0a3b18e56
2016-05-12 11:36:42 -07:00
Matt Brubeck b3152d261a servo: Merge #11157 - Fix unused extern crate warnings in build-cef (from mbrubeck:cef-warnings); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: e9270574783c44b193649d150a29090941d2c661
2016-05-12 10:53:10 -07:00
Anthony Ramine dc2528e601 servo: Merge #11154 - Support GC zeal (from nox:zealot); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: fe3821ff145b46cd225a8e859b019eac65938728
2016-05-12 09:42:21 -07:00
Keith Yeung c30ed37c65 servo: Merge #10714 - Implement user interaction task source (from KiChjang:user-interaction-task); r=Ms2ger
Part of #7959.

Source-Repo: https://github.com/servo/servo
Source-Revision: 42141870e764d0763bfbbdbed70b74399ee342de
2016-05-12 09:00:14 -07:00
Lars Bergstrom 4efb3e30c4 servo: Merge #11156 - Remove codegen-units from cef (from larsbergstrom:more_codegen_units_removal); r=mbrubeck
r? @mbrubeck @metajack

Should fix regression in #11123 that caused build-cef to rebuild again.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9189b9ee63df682a2fc2a57677a8197a69123696
2016-05-12 08:18:03 -07:00
Connor Brewster a9a47b0470 servo: Merge #11006 - Implement navigation events (from cbrewster:history_events); r=asajeffrey
fixes #11005

Events:
 * `PopStateEvent`
 * `HashChangeEvent`
 * `PageTransitionEvent`

Source-Repo: https://github.com/servo/servo
Source-Revision: bca625bd8e60685b92a56d42eab3599a056280f6
2016-05-12 07:27:12 -07:00
Matt Brubeck 806f7d1413 servo: Merge #11148 - Fix some warnings (from mbrubeck:warnings); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d55884d73e57a924a586c26a03bc691ab5c62c39
2016-05-12 06:19:10 -07:00
Matt Brubeck 50f006bc37 servo: Merge #11146 - Update image, hyper, gleam, flate2, threadpool, string_cache, num_cpus (from mbrubeck:always-be-updating); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 9eb7162b8a24662e895a8b04275f0c46e1805f4b
2016-05-12 05:28:12 -07:00
Alan Jeffrey 402a9d47f7 servo: Merge #11141 - Reworded some of PULL_REQUEST_TEMPLATE.md (from asajeffrey:reword-pr-template); r=jdm
Thank you for contributing to Servo! Please add an `X` inside each `[ ]` when the step is complete, and replace `__` with appropriate data:
- [X] `./mach build` 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 are just the PR template

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

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: ef3c4102cf8edab962a950373f88bad5f71e2a90
2016-05-12 04:37:39 -07:00
Alan Jeffrey 74d0803dd4 servo: Merge #11140 - When webdriver is getting a pipeline id, it should wait for the pipeline document to be ready (from asajeffrey:webdriver-pipeline-wait-for-document-ready); r=jgraham
Thank you for contributing to Servo! Please add an `X` inside each `[ ]` when the step is complete, and replace `__` with appropriate data:
- [X] `./mach build` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11117 (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they only impact webdriver

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: 1a834b5b83fba29a4e2f89161ae9734f5f60aff3
2016-05-12 03:46:59 -07:00
Ulf Nilsson d230e205b1 servo: Merge #11142 - Fix inline size adjustment when stripping trailing whitespace from fragments (from kaksmet:another-justify-fix); r=mbrubeck
The whitespace range was not properly shifted which caused us to adjust the fragment's inline size by the advance of a different set of characters.
This was causing justified text lines to be too long or too short.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4a274cf58028267b7cbfbcadebf9504eceb14a4a
2016-05-12 02:56:21 -07:00
Matt Brubeck 4f43a25df2 servo: Merge #11132 - Fix integer overflow in next_power_of_two (from mbrubeck:workqueue-panic); r=larsbergstrom
This causes a panic (debug) or incorrect results (release) when initializing a work queue with thread_count = 1.

Source-Repo: https://github.com/servo/servo
Source-Revision: 695a2559a835b2a753b8c9a3f3401dc7eceeb20d
2016-05-12 00:35:05 -07:00
Keith Yeung 119a304cda servo: Merge #11129 - Use read_block in http_network_fetch (from KiChjang:fetch-read-block); r=jdm
Previously the commented out code was not working because there was a deadlock situation where `res_body` is being locked and borrowed to read the inner `body` if it is a `ResponseBody::Receiving` variant, and then locked and borrowed mutably to change `res_body` to `ResponseBody::Done`.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: e2a5b1cb710b4c5d19d0493e2a304152c42feabe
2016-05-11 23:44:15 -07:00
Cameron McCormack 545ab26c8b servo: Merge #11127 - Support text-align in geckolib (from heycam:text-align); r=bholley
We don't yet support the 'unsafe' keyword, which isn't in a spec yet, and which would require slightly more complex parsing.

Source-Repo: https://github.com/servo/servo
Source-Revision: f12869d2a75081eefeacbe4afe50e870bf0c07cb
2016-05-11 22:53:56 -07:00
Lars Bergstrom d226f1116d servo: Merge #11123 - Disable codegen-units due to performance regressions (from larsbergstrom:disable_codgen_units); r=pcwalton
r? @pcwalton

Fixes #11102.

CC @alexcrichton, @nmatsakis - basically, `codegen-units` is nice for local compilation speedups but results in too many perf regressions to keep it for release builds.

Source-Repo: https://github.com/servo/servo
Source-Revision: cf2b9401ef3ae2aa70768c6b70c54db26332a8b7
2016-05-11 22:03:36 -07:00
Connor Brewster 95730ed890 servo: Merge #11044 - Combine Page into BrowsingContext (from cbrewster:page_to_browsing_context); r=jdm
Fixes #11031.

`Page` and `BrowsingContext` have similar use cases and we decided it would be best to join the two.

This is the ground work for actually using session history in the `BrowsingContext` to implement the History API.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 685dc99e3ef9cf6c88487704709dc13a26812889
2016-05-11 20:53:02 -07:00
Keith Yeung e9fa874e6b servo: Merge #10953 - Implement text/plain form encoding (from KiChjang:text-plain-encoding); r=jdm
Fixes #3649.

Source-Repo: https://github.com/servo/servo
Source-Revision: 641b374f0b752671207d21941c3e5ff4e681d706
2016-05-11 19:43:37 -07:00
Martin Broesamle 7b674f5fb4 servo: Merge #10903 - Avoid panics when using HTMLAnchorElement attribute setters (from broesamle:issue10877-HTMLAnchorElement-setter-panic); r=jdm
`expected: OK` still explicitly mentioned in .ini file. Shall I remove it?

Fixes #10877.

Source-Repo: https://github.com/servo/servo
Source-Revision: 545da3844a8d4f9cb7132def1cd8ab0878cfdb44
2016-05-11 19:03:56 -07:00
Jack Moffitt cf58fa761d servo: Merge #11143 - Update skia and azure to get ccache support (from metajack:ccache-skia-azure); r=mbrubeck
Thank you for contributing to Servo! Please add an `X` inside each `[ ]` when the step is complete, and replace `__` with appropriate data:
- [x] `./mach build` 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 change only compilation

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: f8b7e1c6ae66a0198e38fb959cd959a6ef69b84c
2016-05-11 18:22:46 -07:00
Rohit Zambre e8e9371fba servo: Merge #10995 - Interval + CSV time-profiling (from rzambre:master); r=larsbergstrom
This PR fixes #10886. The -p option can be followed by either an interval number or a CSV filename.
* In the interval profiling, the profiler output would be spitted out to the terminal periodically.
Example usage: **./mach run -p 1 http://www.google.com** will print the time-profiling output to the terminal every second.

* In the CSV file profiling, a CSV file will be generate upon termination of servo.
Example usage: **./mach run -x -o out.png -p out.csv http://www.google.com** will generate out.csv upon termination of Servo.

Source-Repo: https://github.com/servo/servo
Source-Revision: d4315855aaddb9d9ed26cd730e9b75e15500c3bd
2016-05-11 17:19:53 -07:00
aeischeid 0ca1c50fb0 servo: Merge #10713 - add tidy test for space after ":" in stucts (from aeischeid:master); r=jdm
Addresses issue #10702

the tidy self-test doesn't seem to catch the `member_name:"Foo"` line like it should. the regex follows similar pattern in the file and works in my regex tester tool, so not really sure what is going on there.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8c2c0bd964bfbf1a2d7494bd8fbbdd263173ef7d
2016-05-11 16:27:37 -07:00
Bobby Holley dad21c2a95 servo: Merge #11121 - Hoist gecko bindings into their own crate (from bholley:hoist_bindings); r=mbrubeck
This will be helpful for leveraging the bindings with our nsIAtom-backed
string_cache replacement.

Source-Repo: https://github.com/servo/servo
Source-Revision: 49fd06089de8357c0d139f6aa623cde55ccd9ef0

--HG--
rename : servo/ports/geckolib/bindings.rs => servo/ports/geckolib/gecko_bindings/bindings.rs
rename : servo/ports/geckolib/gecko_style_structs.rs => servo/ports/geckolib/gecko_bindings/structs.rs
rename : servo/ports/geckolib/tools/.gitignore => servo/ports/geckolib/gecko_bindings/tools/.gitignore
rename : servo/ports/geckolib/tools/README.md => servo/ports/geckolib/gecko_bindings/tools/README.md
rename : servo/ports/geckolib/tools/regen_style_structs.sh => servo/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh
rename : servo/ports/geckolib/tools/setup_bindgen.sh => servo/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh
2016-05-11 14:59:04 -07:00
Matt Brubeck 633af7b8d2 servo: Merge #11134 - Explicitly list inputs to the style crate's build script (from mbrubeck:style-rerun-if-changed); r=metajack
This avoids unncessary build script runs caused by changes to unrelated files.

Note: Adds a dependency on https://crates.io/crates/walkdir which is MIT licensed and maintained by BurntSushi.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: a85db48623d8f5b5dbddbcc1f1ba0eaa0b531249
2016-05-11 13:22:39 -07:00
Matt Brubeck ae38180d6b servo: Merge #11122 - Use the same build environment and features for CEF, Servo, Gonk, Geckolib (from mbrubeck:unify-builds); r=larsbergstrom
* Remove unnecessary dependencies and features from top-level Cargo.tomls.  The features for each crate will be computed based on the union of features specified in the dependency graph.  Specifying the same ones again just adds more ways for them to get out of sync.
* Move all cargo build environment variables into CommandBase

Fixes #11112. r? @metajack

(Not included: CI test to make sure #11112 doesn't regress again.)

Source-Repo: https://github.com/servo/servo
Source-Revision: 7f76e3ba74a11f1f4bb46f12e17c06270175908f
2016-05-11 12:35:32 -07:00
Matt Brubeck 1edc0e5780 servo: Merge #11135 - Override $CARGO_HOME only if cargo-home-dir is in .servobuild (from mbrubeck:cargo-home); r=larsbergstrom
This preserves the fix from #11097 in the situation where `$CARGO_HOME` and `cargo-home-dir` in `.servobuild` are both present: `.servobuild` should win.

But it changes the behavior when `$CARGO_HOME` is present and `.servobuild` is not:  Then `$CARGO_HOME` should be used.

We now check the following values in order of priority and use the first one that is found:

1. `cargo-home-dir` in `.servobuild`
2. `CARGO_HOME` in the environment
3. default value (`<servo-repo>/.cargo`)

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: fcebfcc1130b7b3e74f14c8375f825f148e0f152
2016-05-11 11:37:05 -07:00
Zhen Zhang 38c9a9b49c servo: Merge #11076 - Implement File DOM object interface (from izgzhen:fileapi); r=Ms2ger
* Rewrite constructors of `Blob` and `File` with `DataSlice` as argument
* Update WebIDL of `Blob` and `File`
* Implement missing interfaces of `File` (However, due to lack of working `ArrayBuffer/ArrayBufferView` in `Blob`, so it still differs from spec)
* Update WPT test `File-constructor.html`

Source-Repo: https://github.com/servo/servo
Source-Revision: 392135bd0c2f512a0d632a7d76e667bc9af8f4a7
2016-05-11 10:28:05 -07:00
Josh Matthews 4c97edbc2c servo: Merge #11118 - Create pull request template (from servo:jdm-patch-1); r=metajack
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 81246a7b61214fbbf7cf32208043afa670af1a7e
2016-05-11 08:36:14 -07:00
Josh Matthews 006edb3c13 servo: Merge #11113 - Trace and finalize BrowsingContext (from jdm:trace_browsingcontext); r=Ms2ger
This is a prerequisite for merging #11044, and is an important correctness fix on its own.

r? @Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: 91cabf8427ae8a7693a56c11abfd32b5058c21de
2016-05-11 05:43:41 -07:00
Zhen Zhang 8dcba1aa4d servo: Merge #11029 - Add FileManagerThread (from izgzhen:filemanager_thread); r=Manishearth
This is intended to support the File API implementation. Basically an event loop with three kinds of messages:

+ Select a file
+ Read a file with ID
+ Delete the ID from manager-owned map

The design decision in this PR is not the final (or best I think) version, welcome reviews :)

TODOs:

- [x] Add multiple file selection

Source-Repo: https://github.com/servo/servo
Source-Revision: b61ad4190f7fb7d4fa32e01a0e3db77a912cb7cf
2016-05-11 04:28:58 -07:00
Patrick Walton 81a194f9b7 servo: Merge #11125 - layout: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts (from pcwalton:reddit-block-formatting-context-fix); r=mbrubeck
Fixes the layout on reddit.com.

Partially addresses #10571.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: 98863746aecea688884ca5a0e3c2f6f139f6e787
2016-05-11 00:41:00 -07:00
Cameron McCormack f1e8b00a0b servo: Merge #11104 - Support outline-width in geckolib (from heycam:outline-width); r=bholley
While here, we make border-*-width round to pixels like Gecko does.

Source-Repo: https://github.com/servo/servo
Source-Revision: 190103a7d7dee0925bb66341d9bc2387a1572a75
2016-05-10 22:20:51 -07:00
Shing Lyu 43d6b05ad9 servo: Merge #10987 - Bug #10181 - Implement *-reverse flex-directions (from shinglyu:flex-reverse); r=shinglyu
Source-Repo: https://github.com/servo/servo
Source-Revision: 20f0be20d702af3c6f99c929191669b183606eb5
2016-05-10 19:51:04 -07:00
Cameron McCormack a66dd06def servo: Merge #11086 - Support border/outline-radius properties in geckolib (from heycam:radius); r=bholley
<s>Because of the way Gecko stores outline-width in nsStyleOutline::mOutlineWidth (i.e., as its specified value for keywords) we need separate property implementations for servo/gecko products.</s>

The -moz-outline-radius parsing is a bit of a hack; I was just avoiding the effort of factoring out the parsing into a separate method. Let me know if I should do that.

<s>Gecko-side changes are https://bugzilla.mozilla.org/show_bug.cgi?id=1271168.</s>

Source-Repo: https://github.com/servo/servo
Source-Revision: a834bc1ec700ca6447ee13bda9714f78381f2f80
2016-05-10 19:00:09 -07:00
Matt Brubeck efac4d0261 servo: Merge #11119 - Make --profile-trace-path work without -p (from mbrubeck:trace-path); r=jdm
Currently `--profile-trace-path` has no effect if `-p` isn't also passed, because the time profiler doesn't start.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8fab68d6a9543248b1e798dfe53036e33654e8cd
2016-05-10 16:00:45 -07:00
Matt Brubeck 1af370c09c servo: Merge #11115 - Use openssl-verify to check certificate + hostname (from mbrubeck:openssl-verify); r=jdm
Fixes #4954.  r? @jdm

This is based on hyperium/hyper#472, though it doesn't re-use that code directly because Servo configures its own OpenSSL context.

Source-Repo: https://github.com/servo/servo
Source-Revision: 40be84df26ce3ce80851e751374154c015506921
2016-05-10 15:00:48 -07:00
Patrick Walton b6bde70e16 servo: Merge #11103 - gfx: Map CSS `normal` font weight to Regular font weight on the Mac (from pcwalton:mac-font-matching); r=metajack
This series of commits fixes #9487, and improves the look of nytimes.com among others.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 1fd9c5583455b873fca1c95b2784f969870073bd
2016-05-10 14:11:35 -07:00
Ulf Nilsson abe21b5d60 servo: Merge #11109 - Make `text-align: justify` incremental layout safe (from kaksmet:justify-fix); r=mbrubeck
Closes #10499
Closes #9057

Source-Repo: https://github.com/servo/servo
Source-Revision: 069be91e8451d197c8f66790fbf53086f22150d7
2016-05-10 12:54:26 -07:00
Fabrice Desré 6f84ad545f servo: Merge #11041 - armv7 update (from fabricedesre:armv7); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 82cc51280e6819ab9f4cb2ef9c4d80266d2fce8a
2016-05-10 11:54:42 -07:00
Alan Jeffrey eb73fbef1e servo: Merge #11049 - Added webdriver delete session command (from asajeffrey:webdriver-delete-session); r=jgraham
Delete session is needed by the web platform test `webdriver/navigation.py`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0c673ef3a2adb3ffd8c3181ee4ec5546d610db5b
2016-05-10 11:05:12 -07:00
Tetsuharu OHZEKI b9d8671144 servo: Merge #11097 - Override always 'CARGO_HOME' env variable (from saneyuki:cargo_home); r=larsbergstrom
This use always `cargo-home-dir` in `/.servobuild` even if you set `CARGO_HOME` in your shell.

If you use [racer][racer] with [rustup (multirust.rs)][rustup], you may set `CARGO_HOME` env variable to your shell. Then the previous code would be a problem which does not use `cargo-home-dir` in `/.servobuild`.

[racer]: https://github.com/phildawes/racer
[rustup]: https://github.com/rust-lang-nursery/rustup.rs

Source-Repo: https://github.com/servo/servo
Source-Revision: 0617727f5b58d1c4ebb10cf081f5952b7961fbf4
2016-05-10 08:20:47 -07:00
Nick Fitzgerald c11fd6b931 servo: Merge #11098 - Update `trace-dump.{js,css}` from upstream (from fitzgen:update-trace-dump); r=jdm
Part of making the trace-dump.js code unit testable was moving it out to another
repo. This brings in all the changes made while writing unit tests, and making
the code more unit testable.

Unfortunately, there are a lot of whitespace changes; here is the diff ignoring whitespace: https://pastebin.mozilla.org/8870346

Fixes #10905.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 835f443865fbaa8784722ad6f950a2c8879fab31
2016-05-10 06:34:32 -07:00