Commit Graph

85 Commits

Author SHA1 Message Date
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
Alan Jeffrey
07258edab3 servo: Merge #14592 - Remove the util crate (from asajeffrey:util-goodbye); r=mbrubeck
<!-- Please describe your changes on the following line: -->

This PR removes the `util` crate.

* Replaced the `spawn_named` and `clamp` functions by appropriate uses of `std:🧵:Builder::spawn`, `std::cmp::min` and `std::cmp::max`.
* Moved `opts`, `prefs` and `resource_files` into a new `config` crate.
* Moved `remutex` and `geometry` into their own crates.

---
<!-- 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 they are refactorings

<!-- 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: 4eb653817f87e5fb47de34356f558eb76ecbca9f

--HG--
rename : servo/components/util/Cargo.toml => servo/components/config/Cargo.toml
rename : servo/components/util/basedir.rs => servo/components/config/basedir.rs
rename : servo/components/util/lib.rs => servo/components/config/lib.rs
rename : servo/components/util/opts.rs => servo/components/config/opts.rs
rename : servo/components/util/prefs.rs => servo/components/config/prefs.rs
rename : servo/components/util/resource_files.rs => servo/components/config/resource_files.rs
rename : servo/components/util/geometry.rs => servo/components/geometry/lib.rs
rename : servo/components/util/remutex.rs => servo/components/remutex/lib.rs
rename : servo/tests/unit/util/lib.rs => servo/tests/unit/servo_config/lib.rs
rename : servo/tests/unit/util/opts.rs => servo/tests/unit/servo_config/opts.rs
rename : servo/tests/unit/util/prefs.rs => servo/tests/unit/servo_config/prefs.rs
rename : servo/tests/unit/util/remutex.rs => servo/tests/unit/servo_remutex/lib.rs
2016-12-14 16:48:42 -08:00
Mátyás Mustoha
83fec4cf21 servo: Merge #14530 - Use android-rs-injected-glue on Android (from mmatyas:android_injectedglue); r=larsbergstrom
<!-- Please describe your changes on the following line: -->
Due to changes in `android-rs-glue`, currently the Android build fails to start. As discussed [here](https://github.com/servo/servo/issues/13154), other than the `android-glue`, we now also have to inject some additional code too. This task is usually done by a helper program of `android-glue`, `cargo-apk`, but since Servo's build system is somewhat more complex than a regular small application, at the moment it'd be more clean to move the required internal `injected-glue` lib to a new repository, and add it as a dependency.

This patch adds a new dependency, `android-rs-injected-glue`, and integrates it into Servo. After applying this commit and #14528, Servo can be launched on Android. (It doesn't *work* yet as expected, though.)

Part of #13154.

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

<!-- 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: 477a9827b82e880048038d9cc26b3000d013a3c4
2016-12-14 02:01:43 -08:00
Ulf Nilsson
145bb120d6 servo: Merge #14558 - Update jpeg-decoder to 0.1.9 (from kaksmet:update-jpeg-decoder); r=KiChjang
Fixes #13164

Source-Repo: https://github.com/servo/servo
Source-Revision: ff6ca113dba4d6970762aac6f0a791b89b2d6fef
2016-12-12 14:58:14 -08:00
Xidorn Quan
a685fc7563 servo: Merge #14244 - Use build script to generate binding files (from upsuper:buildtime-bindgen); r=emilio
<!-- Please describe your changes on the following line: -->
This is a WIP patch to make rust-bindgen a build time dependency of style component for stylo. This should make things more automatic. I convert majority of `regen.py` to `build_gecko.rs`.

It currently doesn't work on Windows, because of servo/rust-bindgen#271 (it works when I fix the generated file manually, though). I haven't tested other platforms.

It would break servo's CI for geckolib, because:
1. it needs libclang (which is probably easy to solve)
2. it needs `MOZ_OBJDIR` to be passed in so that it can generate bindings

@Manishearth @emilio Do you agree with this change? Do you have suggestion for the issues above?

---
<!-- 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: 872ec89a9c546eb05246b5047aabfc032d140eff
2016-12-10 03:21:42 -08:00
Simon Sapin
b176e4d08e servo: Merge #14535 - Introduce a PropertyId enum and use it instead of strings of property names (from servo:property-id); r=mbrubeck
<!-- Please describe your changes on the following line: -->

* `LonghandId` and `ShorthandId` are C-like enums
* `Atom` is used for the name of custom properties.
* `PropertyDeclarationId` is the identifier for `PropertyDeclaration`,
  after parsing and shorthand expansion. (Longhand or custom property.)
* `PropertyId` represents any CSS property, e.g. in CSSOM.
  (Longhand, shorthand, or custom.)

CC @upsuper

---
<!-- 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: 6dd4b4822fa788694153ee61a04dd9a5dfb748ec
2016-12-10 01:16:26 -08:00
Jansen Jan
23b92da701 servo: Merge #13489 - Add support for fullscreen #10102 (from farodin91:fullscreen); r=jdm
<!-- Please describe your changes on the following line: -->

I'm start working on fullscreen support.
@jdm Should be the entry_point in ScriptReflow a Option if fullscreen is enabled or point on the entry_node? For example the RootNode.

---

<!-- 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 #10102  (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: 8b69e73594647319e95bd0fd36c2addabcee1e5d
2016-12-09 09:52:34 -08:00
Corey Farwell
fae587d847 servo: Merge #14499 - Add uncommitted lockfile change; fix check script. 🔒 (from frewsxcv:lockfile); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 51a5a3402ced7a330c2a7d377dc4459792a28bee
2016-12-08 13:29:07 -08:00
Anthony Ramine
45df216ae8 servo: Merge #14423 - Properly mark application/xhtml+xml documents as XML (from nox:xml-document); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 5abbc9f69668f23469a9c01937c68e305fa36cd8
2016-12-01 03:57:14 -08:00
Imanol Fernandez
bf25e810b6 servo: Merge #14075 - Implement WebGLContext resize (from MortimerGoro:webgl-resize); r=MortimerGoro
<!-- Please describe your changes on the following line: -->

Related PR: https://github.com/servo/webrender/pull/519

Implement WebGLContext resize (canvas.width & canvas.height). I have tested:

- Fixes WebGL apps that initialize canvas size after calling canvas.getContext("webgl")
- Support WebGL apps that change the canvas size & viewport on window.onresize

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

<!-- 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: 94eefc4001e0998fcea5a35943da73624ea82b13
2016-12-01 03:04:49 -08:00
Anthony Ramine
de5ae52b90 servo: Merge #14292 - Update to Rust 1.15.0-nightly (1c448574b 2016-11-28) (from servo:rustup); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: f159b5cb1028bf4d2f75b0b48055fe19a8032f8e
2016-11-29 12:20:58 -08:00
Martin Robinson
bd80dcc63d servo: Merge #14386 - Use new DisplayListBuilder improvements in Servo (from mrobinson:display-list-builder-updates); r=glennw
<!-- 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.

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

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1c6963144d0496d8dcbb7a7ca6782d01d3305441
2016-11-29 02:36:05 -08:00
Anthony Ramine
e20c332d45 servo: Merge #14381 - Move to Cargo workspaces (from servo:workspaces); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: eb7032f6dd5e8a1f8c0602666805d1d10cc84e65

--HG--
rename : servo/ports/servo/Cargo.lock => servo/Cargo.lock
2016-11-28 01:44:40 -08:00
Simon Sapin
2d8a1f7245 servo: Merge #4140 - Move the root Cargo.toml to components/servo, and warn when Cargo is run directly (from SimonSapin:no-root-cargo-toml); r=SimonSapin
This fixes #3957, and allow #4115 not to regress #4099.

Source-Repo: https://github.com/servo/servo
Source-Revision: 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b

--HG--
rename : servo/Cargo.lock => servo/components/servo/Cargo.lock
rename : servo/src/lib.rs => servo/components/servo/lib.rs
rename : servo/src/main.rs => servo/components/servo/main.rs
2014-12-02 19:27:51 -07:00
Martin Robinson
05cadfd2fd servo: Merge #4074 - Update rust-layers to fix empty BufferRequest failures (from mrobinson:empty-tiles); r=jdm
rust-layers will now avoid sending empty buffer requests which can
cause failures when Servo tries to create empty platform surfaces.

Fixes #4060.

Source-Repo: https://github.com/servo/servo
Source-Revision: b33c31b5748ddfe4f1aec5f0813b47dc74adf604
2014-11-23 09:09:36 -07:00
Glenn Watson
0d90c86c04 servo: Merge #4052 - Make glutin work on mac (from glennw:update-glutin); r=larsbergstrom
- Update glutin, and update rust-cocoa to use the servo fork now that upstream is up to date.
- Some events and resizing are still not working correctly on mac yet.

Source-Repo: https://github.com/servo/servo
Source-Revision: b4c3aec383b2b1cd19ab6267775f9fb3735aa977
2014-11-21 08:51:31 -07:00
Glenn Watson
8a83aa075e servo: Merge #4035 - Remove rust-alert as it's broken on mac, and unimplemented on other platforms (from glennw:remove-rust-alert); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 554f696db81665f92e9976a15d986b0fd0f99edf
2014-11-18 21:30:27 -07:00
Glenn Watson
c04e3b2bc7 servo: Merge #4028 - Add glutin port (supported on Linux only currently) (from glennw:glutin); r=larsbergstrom
Default build uses glfw, but glutin can be enabled via:

./mach cargo build --no-default-features --features=glutin

Remaining work:
 * Mac
 * Android
 * hi-dpi
 * nested event loop

This PR also enables true headless (without X) rendering on Linux by specifying the rendering API as Mesa.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5c6146de0b3bfda97edff6662033f4a981df3f6
2014-11-18 15:48:29 -07:00
Simon Sapin
bc85e619ae servo: Merge #4016 - Fix freetype build (from SimonSapin:fix-freetype-build); r=Manishearth
Pick up https://github.com/servo/libfreetype2/pull/3

r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: bd4f94a11f556451634ac073e690fa42816e5580
2014-11-17 08:30:31 -07:00
Glenn Watson
a9771bc8d8 servo: Merge #4012 - Update green-rs submodule to get android tls fix (from glennw:update-green-rs); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: a51d08737a1f7337f6fad1d3f28b11345fed70e2
2014-11-16 20:21:28 -07:00
Glenn Watson
7ecba6a00a servo: Merge #4011 - Update gleam submodule, and use glfw to load OpenGL function pointers (from glennw:gleam-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 3da9ad464db7e3a422e06f82285aff15b7375344
2014-11-16 16:09:28 -07:00
Simon Sapin
05c514b3b2 servo: Merge #3980 - Use freetype-sys on Linux (from SimonSapin:freetype-sys-linux); r=larsbergstrom
See:
https://github.com/servo/libfreetype2/pull/2
https://github.com/servo/skia/pull/38
https://github.com/servo/rust-azure/pull/114

Let’s close #3867, even though this only works around and doesn’t fix the underlying issue.

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 644765ea5e5a7981f3c35f74c10e2c744409c2a9
2014-11-15 12:48:29 -07:00
Matt Brubeck
8f62c2a692 servo: Merge #3985 - Update Cargo.lock files for Android rustup fixes (from mbrubeck:android-green); r=larsbergstrom
r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: e3ee984f1747b27e66b80c8418af7ce51739880d
2014-11-14 15:03:35 -07:00
Glenn Watson
22c4035692 servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
Martin Robinson
8cec6a7fbe servo: Merge #3809 - Clip display list based on frame viewport (from mrobinson:display-list-optimization); r=pcwalton
Instead of creating a display list for the entire page, only create one
for an area that expands around the viewport. On my machine this makes
incremental layout of http://timecube.com 50% faster.

Source-Repo: https://github.com/servo/servo
Source-Revision: 26045d7fcbab8851fbefe2851cd904203f8fd8dd
2014-11-12 17:36:32 -07:00
Glenn Watson
baab1dcc7f servo: Merge #3922 - Update cargo to get fix for pinned dependencies of features (from glennw:update-cargo); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: fa7596015addedc4db50ce735100d7560482011d
2014-11-06 15:36:29 -07:00
Patrick Walton
35e2f9710a servo: Merge #3761 - Invert control flow, fix resizing, and improve checkerboarding significantly (from pcwalton:smooth-scrolling); r=larsbergstrom
r? @glennw @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: ffae1104989c0177b483d591a482e5cd877183c2
2014-11-04 18:12:32 -07:00
Glenn Watson
c3fd7b82f4 servo: Merge #3861 - Update azure. This removes the final rust-opengles dependency (from glennw:update-azure); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 37bbe352a862f931f061a37eeaac9ebbddf79a04
2014-10-30 15:57:38 -06:00
Glenn Watson
a6fb05afeb servo: Merge #3851 - Update to use new GL bindings (from glennw:servo_gl); r=glennw,metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f9b84fd8704e249682cc12dfeb2da61b39a88d92
2014-10-29 23:33:35 -06:00
Glenn Watson
cfd1172702 servo: Merge #3846 - Update to use CGL crate for mac (from glennw:cgl); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: b8de54bc63a27ec55db683bba7430cbd0e4aa9e4
2014-10-29 09:24:40 -06:00
Glenn Watson
779c6bd37a servo: Merge #3845 - Update layers, opengles to use the new glx bindings (from glennw:update-layers-opengles); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f632f644391c2f49ec870ceb713a108e268f384b
2014-10-28 23:12:40 -06:00
Glenn Watson
18ad335174 servo: Merge #3842 - Update azure to remove glfw dependency (from glennw:update-azure); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: b68f72380b4ccc330f7989fd773011360900ad1a
2014-10-28 22:15:38 -06:00
Clark Gaebel
1df0853045 servo: Merge #3827 - Run all task spawning through util, to allow for easy hooking (from cgaebel:use-custom-spawn); r=pcwalton
During debugging, I found it useful to hook all task creation in a
central location, and util::task was the perfect place for it.

r? @pcwalton (or maybe someone else, I'm kinda sending you a bunch of
reviews today because I don't know who better to give them to)

Source-Repo: https://github.com/servo/servo
Source-Revision: ff06be91ebe770290ba912ee71a303810aa62cea
2014-10-28 11:24:43 -06:00
Glenn Watson
dfb5051db6 servo: Merge #3816 - Fix cargo.lock that got out of sync when two successive commits (1) updated the SHA (2) added the dependency to util with the old SHA (from glennw:cargo-lock-fix); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 005cfed6e99069e0d7f50414db7aab32411872a8
2014-10-26 16:12:38 -06:00
Josh Matthews
853c1f1058 servo: Merge #3801 - Add missing Cargo.lock deps change (from jdm:utildeps2); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 3be4af057fcf4fc050e0e78330585f8d0d131fc3
2014-10-24 15:21:33 -06:00
Josh Matthews
9bff9dccb5 servo: Merge #3803 - Add an optional --debug-mozjs argument to mach build that enables a no (from jdm:mozjsdebug); r=mbrubeck
...n-optimized, debug build of mozjs and rust-mozjs. Update the Cargo snapshot to enable new feature support.

Source-Repo: https://github.com/servo/servo
Source-Revision: e100a1834f40599952a790d2537d2b1262585e82
2014-10-24 14:39:33 -06:00
Glenn Watson
8755e7f008 servo: Merge #3800 - Use WindowMethods to get native graphics metadata instead of relying on azure (from glennw:native-gfx-metadata); r=mbrubeck
This is a prerequisite for glutin support.

Tested on Linux, mac. Tested that android + cef build.

Source-Repo: https://github.com/servo/servo
Source-Revision: a2587462693bf73412a729dfaccb2abb0d3f6ff6
2014-10-23 23:03:29 -06:00
Glenn Watson
9a62901e5b servo: Merge #3799 - Update rust-layers and friends for android build fix (from glennw:update-layers)
Source-Repo: https://github.com/servo/servo
Source-Revision: 44eec48c575e3ed87c8556e7e14a6bd5f6d8aa55
2014-10-23 21:07:21 -06:00