Commit Graph

242 Commits

Author SHA1 Message Date
Anthony Ramine
6bb66d30be servo: Merge #12828 - Update serde to 0.8 (fixes #12659) (from nox:serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 9abe9e450b54ef9151bbee1aa0bd2dedb685fa7a
2016-08-12 12:23:10 -05:00
Martin Robinson
4902811eaf servo: Merge #12817 - Update to euclid 0.8 (from servo:euclid); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b915c403d2e96bd2917e7df4f2a58a6668a0c0e
2016-08-11 20:12:29 -05:00
Glenn Watson
0a0c38a262 servo: Merge #12711 - Update webrender, copy new shaders, pin ipc-channel (from servo:wr-wr-next); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: e2d4ff5b62aff7fc6f40460270af44e1ab5283d4
2016-08-03 07:50:06 -05:00
Dirkjan Ochtman
9f5b10ca4c servo: Merge #12490 - Remove dependency on util::opts from canvas crate (from djc:canvas-no-opts); 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
- [ ] 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's a small 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: ca9bc23b391b92d1a6e16f565b531a7fac68852c
2016-07-20 09:19:04 -05:00
Alan Jeffrey
1a348eb9d5 servo: Merge #12447 - All our Cargo.toml files should contain an MPL-2.0 license field (from asajeffrey:license-mpl-2.0); r=frewsxcv
<!-- Please describe your changes on the following line: -->

Added a `license = "MPL-2.0"` field to all our `Cargo.toml` files, and added a check to `test-tidy` that the license is present.

---
<!-- 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 #12434
- [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: 650d1d1185eecdc4c8b605bb0290ece7de839015
2016-07-14 09:33:18 -07:00
Emilio Cobos Álvarez
c0c37fea38 servo: Merge #11750 - canvas: Deallocate WebRender images on canvas (from emilio:canvas-leaks); r=glennw
canvas: Deallocate WebRender images on canvas

<!-- 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 #11062.

- [x] These changes do not require tests because it's wr-only.

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

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 1ff8d875dddb81c2697e155cc954d106c5433055
2016-07-10 20:09:48 -07:00
Emilio Cobos Álvarez
e9cb41e689 servo: Merge #11744 - webgl: Unlock WebRender by default by adding a readback based fallback to WebGL context creation (from emilio:wr-default); 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

<!-- Either: -->
- [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. -->

This should give us the chance to use WebRender by default in OSX.

r? @pcwalton

cc @glennw @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 68aca87e305138b2851c853149e0606756eb02b8
2016-07-10 17:25:29 -07:00
Anthony Ramine
c394aff8fa servo: Merge #12224 - Remove some stuff from util (from nox:die-util-die); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 3b0dadda529a5ba45a8a0dc394187f43a66e7c1f
2016-07-04 12:57:00 -07:00
Anthony Ramine
9f8da4edd0 servo: Merge #11871 - Update Rust to 1.11.0-nightly (ad7fe6521 2016-06-23) (from servo:rustup); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e3e5a51ff692635e7eabd2b244a975686f1064c4
2016-06-27 09:47:34 -05:00
Anthony Ramine
be758d65a4 servo: Merge #11506 - Make canvas send their data themselves to other canvas (from nox:slither); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 5a0c98afb2998e7990e1c813f2bc15fe3c191638
2016-06-17 02:07:37 -05:00
Josh Matthews
5f71922341 servo: Merge #11472 - Report blank lines that follow an open brace (from jdm:wip); r=mbrubeck
This automates something that I find myself frequently commenting on in PRs.

---
<!-- 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] There are tests for these changes OR

<!-- 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: 3ec20d9cf517c67f4d280e8958cc58c4c2b4fbb2
2016-05-27 18:14:25 -05:00
Ms2ger
4ff63fe485 servo: Merge #11265 - Some assorted cleanup (from Ms2ger:cleanup); 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 --faster` 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 _____

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: 2572a7d2c5ba90cc78f6be10bb29c2e8fbc8f250
2016-05-19 05:48:24 -07:00
Simon Sapin
9f47ba4f82 servo: Merge #10857 - Simplify TOML syntax (from servo:toml); r=nox
* Sections like `[dependencies.foo]` can be entries in a `[dependencies]` section with the `{key = value}` syntax.
* Per-target dependencies can be expressed with more general `cfg(…)` conditions instead of exact target triples: https://github.com/rust-lang/cargo/pull/2328

Source-Repo: https://github.com/servo/servo
Source-Revision: 2729864af73d62719ea0fd55cef417c43bdd951e
2016-04-26 15:46:37 -07:00
Zbynek Winkler
aa72c25a6b servo: Merge #10706 - Turn on unused-extern-crates warning (from zwn:unused-extern-crates); r=nox
As discussed in #9256. It should solve second half of the issue.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0a3a50a1293e4e8f3e04161014d03802765140c7
2016-04-22 13:40:38 -07:00
Ms2ger
d55ddb7e72 servo: Merge #10750 - Use num's constituent crates (from servo:num); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 89b276c889ce76f8fe43c22779835af138472dac
2016-04-20 20:10:24 +05:00
Emilio Cobos Álvarez
c4a514963d servo: Merge #10224 - webgl: Add attribute validations and other nits (from emilio:shader-type-validations); r=jdm
Fixes https://github.com/servo/servo/issues/9958

Depends on a bunch of prs, and needs a test.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: f0014bd9cd5ac5db3e5a2f9fa8eafeb992df309a
2016-04-12 04:48:49 +05:00
Paul Padier
cadd8e35d1 servo: Merge #9911 - Do not use lookup tables for put_image_data (from magni-:dont_use_lookup_tables); r=michaelwu
Fixes #9599

"This is the first Rust code I have ever written" (and also my first time writing real browser code, it's been quite the learning experience).

Some questions:

> For really fast CPU results, use integer SIMD instructions to handle more than one pixel at a time.

This was out of the scope of #9599, right? I started looking into doing that, but it seems to be a lot more work than the `E-easy` label would suggest. [`std::simd`](https://doc.rust-lang.org/1.0.0/std/simd/index.html) is marked as "unstable", is that a blocker?

> 128 can be added before dividing to round more accurately.

@michaelwu, what did you mean by that?

Also, the #9599 is `Do not use lookup tables for {Get,Put}ImageData operations`, but we only use lookup tables for the `Put`, not the `Get`, right?

Sorry for all the noobish questions.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4e4a213c73d49641fdfbf83c31152295d4856ae0
2016-04-01 23:27:19 +05:00
Jan-Fabian Humann
e5a6ccf935 servo: Merge #10291 - #10211: Stop re-exporting webrender_traits WebGL types from canvas_traits (from jfhumann:10211); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 524a004e771b465e3de9ebbc33816e50949d6a25
2016-04-01 01:27:20 +05:00
Emilio Cobos Álvarez
bd70866e46 servo: Merge #10302 - Update webrender to master (from emilio:webrender-up); r=nox
I'll rebase #10224 against it.

Sorry for the blocking of #10224, I expected it to be reviewed way sooner, my fault for landing breaking changes.

r? @nox or @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 84a3dee67ea7a45d6ec505f59c7a55162621f11e
2016-03-31 21:21:06 +05:00
Anthony Ramine
3b20e624da servo: Merge #10297 - Update webrender with crates.io's offscreen_gl_context (fixes #10296) (from servo:the-offscreens); r=pcwalton
Crate webrender is bumped to the first commit in https://github.com/servo/webrender/pull/248.
Crate webrender_traits is bumped to the merge of https://github.com/servo/webrender_traits/pull/21.

Source-Repo: https://github.com/servo/servo
Source-Revision: 436f7316d97eabff4238c774a8ff7cc66fca08a0
2016-03-31 06:12:31 +05:00
Ms2ger
27851cf695 servo: Merge #10267 - Simplify channel usage in canvas paint threads (from Ms2ger:canvas-channels); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: df808bed20a097719992f3c355bd164c4abc8913
2016-03-29 19:37:54 +05:00
Emilio Cobos Álvarez
400781e2ab servo: Merge #10150 - Canvas cleanup (from emilio:canvas-cleanup); r=jdm
This PR cleans up the layerization infrastructure for canvas, which was unused, and removes unused dependencies.

It also takes in account my recent username change to update angle's dependency (offscreen_gl_context requires extra work due to webrender depending on it).

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 2887623c4ae1960dfef52b14cd4afc3b279f9feb
2016-03-24 08:14:40 +05:00
Ms2ger
d71ac85104 servo: Merge #10106 - Remove renderer ids (from Ms2ger:renderer-id); r=ecoal95
Source-Repo: https://github.com/servo/servo
Source-Revision: 767b11cd676327cfb71f21d2cbcee8c16a74e2b3
2016-03-22 08:20:28 +05:00
Ms2ger
aa205ccea0 servo: Merge #10075 - Deny unsafe code in more crates (from Ms2ger:deny-unsafe); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8c92e3f32b9aa6a75dc8980da49359ea63f9d67a
2016-03-20 07:30:53 +05:00
Anthony Ramine
37371c7786 servo: Merge #10055 - Bump serde to 0.7 (from servo:serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 7a9dc577617b442ff0fe07eaa683207234c519ee
2016-03-17 17:57:36 +05:00
Anthony Ramine
55910de9d1 servo: Merge #9943 - Preliminary bumps for bumping Serde (from servo:serde-preliminaries); r=jdm
We need to bump webrender before being able to bump Serde, but we also needs these bumps, so let's include them ASAP first because bumping a lot of things is always a pain.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f526054ebfa164ca2545d881b8392a744af7870
2016-03-10 00:20:36 +05:00
Corey Farwell
2de6b50b80 servo: Merge #9857 - Indicate components should not be published to crates.io (from servo:publish-false); r=ecoal95
http://doc.crates.io/manifest.html#the-publish--field-optional

Source-Repo: https://github.com/servo/servo
Source-Revision: 633f0414aaa177e439528f0fa848a41bc0fc094a
2016-03-04 01:07:14 +05:00
Corey Farwell
50ab42c29d servo: Merge #9733 - Update webrender crate refs to reflect ownership change (from servo:servo-webrender); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 33f0040496bde88683cfadb4068183f7d08a5f1c
2016-02-24 06:22:40 +05:00
Glenn Watson
3b05a50ca8 servo: Merge #9589 - Add WebRender integration to Servo (from glennw:webrender); r=pcwalton
WebRender is an experimental GPU accelerated rendering backend for Servo.

The WebRender backend can be specified by running Servo with the -w option (otherwise the default rendering backend will be used).

WebRender has many bugs, and missing features - but it is usable to browse most websites - please report any WebRender specific rendering bugs you encounter!

Source-Repo: https://github.com/servo/servo
Source-Revision: ab07b06823ea9748a6091aee2281495f86f00bce
2016-02-19 00:24:06 +05:00
Anthony Ramine
361e9b1a9e servo: Merge #9622 - Bump heapsize to 0.3 (from nox:heapsize); r=ecoal95
Source-Repo: https://github.com/servo/servo
Source-Revision: a164176876bb6abccf729eb5d6334e3c22230103
2016-02-13 18:20:41 +05:00
Tim van der Meij
e2491df642 servo: Merge #9512 - Remove old features 'clone_from_slice' and 'convert' (from timvandermeij:feature-cleanup); r=frewsxcv
Fixes #9495.

Source-Repo: https://github.com/servo/servo
Source-Revision: 647637193d12eb4869afa93106d3aa14721a0935
2016-02-04 17:41:52 +05:00
Ms2ger
5469052315 servo: Merge #9519 - Update Euclid (from Ms2ger:euclid); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 712b053f4f597a097767a0812013b95c7db8b3c9
2016-02-04 16:05:48 +05:00
Glenn Watson
9f26653699 servo: Merge #9452 - This updates gleam to a version that relies on OpenGL 3.3 (which is n… (from glennw:update-gleam-again); r=ecoal95
…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b1a08c051f3be4b7bc7e6200053dfa530ecd106
2016-02-01 05:56:54 +05:00
Matthew Kuo
46405ef220 servo: Merge #9363 - Remove remaining unused imports (from mattkuo:clean-imports); r=KiChjang
Closes #9361

Source-Repo: https://github.com/servo/servo
Source-Revision: 6a38d55ceafca08d6ce83c8cbfa5f55835f9e141
2016-01-18 10:34:06 +05:00
Emilio Cobos Álvarez
ddc66a221c servo: Merge #9107 - webgl: Track the current program, implement some uniform functions, and nits (from emilio:webgl-uniforms-and-nits); r=simartin
Was done while implementing sequence arguments.

Depends on #9056.

Source-Repo: https://github.com/servo/servo
Source-Revision: c13e84010d1dd33c5532cdfa2937dddd4db4dd26
2016-01-13 21:44:59 +05:00
Ms2ger
2679e8ce87 servo: Merge #9275 - Remove some unused extern crates (from Ms2ger:extern-crate); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b5dda3e9c38f6cd4ec9b82f023bf3698addc65f
2016-01-13 20:46:35 +05:00
Josh Leverette
4497ad6021 servo: Merge #9240 - Refactor WebGLPaintTask to prevent creating extra IPC channels #9228 (from coder543:Refactoring); r=ecoal95
Closes #9228

I think this code will actually do what is desired now. I had to rebase off of master since WebGLPaintTask was renamed to WebGLPaintThread in a commit since last night.

I'm sorry this has been so much trouble so far. I'm still learning how things are done around here. I didn't even think about trailing whitespace, but now I know about the test-tidy tool.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b1e73c1c0cf3fe2c935df0de667145bc6130461
2016-01-12 17:03:32 +05:00
rohan.prinja
c098aafd20 servo: Merge #9201 - task -> thread (from ajnirp:8512-task-thread); r=jdm
for #8512

Source-Repo: https://github.com/servo/servo
Source-Revision: d3e2f94f2024f4735f836588ed11303a0abafdf8
2016-01-10 15:19:04 +05:00
Emilio Cobos Álvarez
b505a7cfb5 servo: Merge #9210 - webgl: Create the paint task object in the thread (from emilio:webgl-task-in-thread); r=jdm
This avoids problems like:
https://github.com/servo/servo/issues/9006#issuecomment-170007845

See that conversation for more details.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0002048ed9be66bd4132caf094e37d2c4587201f
2016-01-09 04:37:11 +05:00
Emilio Cobos Álvarez
4efe383ef8 servo: Merge #9044 - Update offscreen_gl_context (from emilio:offscreen-gl-up); r=jdm
cc: https://github.com/ecoal95/rust-offscreen-rendering-context/pull/46
Source-Repo: https://github.com/servo/servo
Source-Revision: da8952b7023a92b7a69bd4423905594f4baa8f29
2015-12-23 20:05:37 +05:00
David Zbarsky
b87f0bbe9a servo: Merge #8997 - Implement WebGL scissor method (from dzbarsky:scissor); r=dzbarsky
Source-Repo: https://github.com/servo/servo
Source-Revision: 1695c0ad27e4c9c062e26a5db154521e400ecbd9
2015-12-16 10:35:32 +05:00
David Zbarsky
e8b98cf1e6 servo: Merge #8761 - Implement some more WebGL functions (from dzbarsky:gl_functions); r=dzbarsky
r? @ecoal95

Source-Repo: https://github.com/servo/servo
Source-Revision: 89d9aad1e1e3cd93b12088f09aad1193e7298ba4
2015-12-14 07:55:20 +05:00
Tetsuharu OHZEKI
2570434ec3 servo: Merge #8937 - Fix some warnings (from saneyuki:warning); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 2977795e39989ca776f7e36169db2dc05294f74b
2015-12-11 22:22:47 +05:00
Tetsuharu OHZEKI
56a958507a servo: Merge #8922 - Fix warnings: Use Vec.extend_from_slice instead of Vec.push_all (from saneyuki:warning); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: d01233a7b417c87b18d31f10709ed83141887b94
2015-12-11 04:27:58 +05:00
Roman Klauke
31c68584fe servo: Merge #8920 - remove the "core" feature attribute from canvas (from romankl:core-feature); r=Ms2ger
The core feature is marked as stable and gives this nice warning:
```
servo/components/canvas_traits/lib.rs:7:12: 7:16 warning: this feature is stable. attribute no longer needed, #[warn(stable_features)] on by default
/servo/components/canvas_traits/lib.rs:7 #![feature(core)]
```
This commit removes the usage of this feature.

Source-Repo: https://github.com/servo/servo
Source-Revision: 996c0a60b81e7d7e0fbfea81a546771ea9327df6
2015-12-11 02:09:37 +05:00
David Zbarsky
114af9bcc3 servo: Merge #8740 - Implement IsPointInPath for Canvas (from dzbarsky:ispointinpath); r=frewsxcv
Source-Repo: https://github.com/servo/servo
Source-Revision: 98972d04342602610a7465de7b0639e2b9c1dcf3
2015-12-06 06:49:23 +05:00
Emilio Cobos Álvarez
d2aa423ba5 servo: Merge #8788 - webgl: Fix texturing (from emilio:fix-webgl-texturing); r=jdm
These two tiny changes were making WebGL textures not work.

It was not seen in our texturing test since it only used one texture,
we render to a texture by default, and that texture was bound to
`gl::TEXTURE_2D`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cfcc26d9e5cc732a7594f0c0d96d4174c6b0a8a
2015-12-04 21:42:26 +05:00
Simon Sapin
1082118bc3 servo: Merge #8800 - Fix warnings (from servo:warnings); r=metajack
Fixing unused attributes warnings required updating serde_macros
which required updating to rustc 1.6.0-nightly (a2866e387 2015-11-30)
which required updating some other dependencies.

Fix #8709.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32b90cdb6ff8f24dfd93aa44c2bae9c4f15429e0
2015-12-04 05:07:38 +05:00
Simon Martin
6f3f4b1f6f servo: Merge #8712 - Issue #8462: Add support for BufferSubData, CompressedTexImage2D and CompressedSubTexImage2D and reenable individual webgl WPT tests (from simartin:issue_8462); r=ecoal95
Fixes https://github.com/servo/servo/issues/8462

Source-Repo: https://github.com/servo/servo
Source-Revision: 5ee6fe120d43506e263cb4482b3a468d967a8386
2015-12-04 00:37:14 +05:00
Simon Sapin
dac4e7f3cc servo: Merge #8757 - Use skia and deps from crates.io (from servo:skia); r=mbrubeck
This makes the initial download for skia go from a 300 MB git repository to a 5 MB tarball. This should help with issues like #6132 and #7687.

Fix https://github.com/servo/skia/issues/70

This builds, but the at the moment causes a number of tidy errors for duplicated crates.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8b95d7b8d860ec4c0834192083361a9fb78ddbeb
2015-12-03 12:28:29 +05:00