Commit Graph

162 Commits

Author SHA1 Message Date
Wojciech "Zarazek" Wiśniewski
40d532f852 servo: Merge #4776 - PNG library upgrade (from zarazek:master); r=glennw
Update to new version of PNG library. See earlier pull reqest for PNG lib: https://github.com/servo/rust-png/pull/57

Source-Repo: https://github.com/servo/servo
Source-Revision: 06cedc8317663a71c06f0a2a482f2b4c3759b6be
2015-01-30 14:00:54 -07:00
Glenn Watson
6fd8223ef8 servo: Merge #4775 - Switch glutin to use servo fork, which contains a crash fix for XCloseDisplay in some X11 drivers (from glennw:fix-x11-crash); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f58a129251068a6e63b40d0bc46805a60398433a
2015-01-29 15:54:50 -07:00
Ms2ger
3cee792603 servo: Merge #4766 - Import the util crate as util rather than servo_util (from Ms2ger:util); r=Manishearth
This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.

Source-Repo: https://github.com/servo/servo
Source-Revision: 27e0f16407629422b5e047e067d458142372c97e
2015-01-29 05:12:49 -07:00
Martin Robinson
92a8d49784 servo: Merge #4759 - Update to the latest rust-layers (from mrobinson:layers); r=glennw
Fixes #4754.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9fac4837616fbfe375cea5d2c862b3de64d21302
2015-01-28 15:24:51 -07:00
Ms2ger
39a22519e3 servo: Merge #4756 - Fix various build warnings (from Ms2ger:warnings); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 88b781421aa78a2f466e6d170f89d13a870643cd
2015-01-28 13:15:53 -07:00
Ms2ger
56af1c9da9 servo: Merge #4752 - Update xlib (from Ms2ger:update-xlib); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 95f71eea5c4d5c220abd3307b08f48bf86504eca
2015-01-28 11:03:53 -07:00
Akos Kiss
5b165b4e65 servo: Merge #4740 - Update dependencies in lock files (from akosthekiss:pr-deps); r=metajack
* openssl
* glfw
* gleam
* skia
* mozjs

Source-Repo: https://github.com/servo/servo
Source-Revision: d59743216750a397f03da2e4c58d6ccee00856f1
2015-01-28 09:36:53 -07:00
Ms2ger
aeb7e45aa9 servo: Merge #4743 - Update layers to master (from Ms2ger:update-layers); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: cc2523eed5bdddd054ce6918e7d2d1d7d22d9286
2015-01-28 04:54:51 -07:00
Glenn Watson
ecde6d577d servo: Merge #4737 - Temporary workaround for change in wait_events behaviour in glutin (from glennw:poll-events); r=kmcallister
Source-Repo: https://github.com/servo/servo
Source-Revision: e122d76fa914375e13e7f3983bfe9d0f660b4d04
2015-01-27 22:51:55 -07:00
Josh Matthews
78741af324 servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Glenn Watson
2d715b49a9 servo: Merge #4707 - Change glutin headless mode to be a build config, as it breaks some Linux distros linking to both (from glennw:split-headless); r=larsbergstrom
The majority of this change is simply re-arranging the code in the glutin port so that the windowed/headless code is configured at build time rather than runtime. There shouldn't be any functional difference as a result of this change.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b496d80dec4f202e0f318ee60ac156ad74256ff
2015-01-22 14:48:48 -07:00
Ms2ger
7363fc6372 servo: Merge #4708 - Prepare for the rust upgrade (from Ms2ger:rustup-prepare); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 55fbf1f2b6924c50cff6e4ddf359289654f4858a
2015-01-22 08:06:50 -07:00
Simon Sapin
269dcf54f6 servo: Merge #4689 - Port to the new cssparser (from servo:newnewnewcss); r=larsbergstrom
https://github.com/servo/rust-cssparser/pull/68

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 59bca2962c19f653eec835fc54caf1a3eadcb906
2015-01-21 14:27:48 -07:00
Ms2ger
190438fa42 servo: Merge #4682 - Move to to_owned rather than into_string (from servo:to_owned); r=jdm
into_string has been removed from Rust.

Source-Repo: https://github.com/servo/servo
Source-Revision: 94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997
2015-01-20 07:54:46 -07:00
Ms2ger
16be5944e2 servo: Merge #4679 - Stop calling is_not_null (from Ms2ger:is_not_null); r=larsbergstrom
It has been removed from Rust.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2d5b0e085571594e7da2ee519605dd6fac2caa54
2015-01-20 06:00:47 -07:00
Glenn Watson
3553e1d199 servo: Merge #4655 - Switch CEF build from glfw -> glutin. Add glutin key bindings (from glennw:cef-glutin); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: e4f0b816d50f751ee0ea4678d485e1627dcce0e5
2015-01-19 12:57:46 -07:00
Glenn Watson
8c4b2aa734 servo: Merge #4657 - Add basic support for closing cef tabs. Prevents crashes, but leaks memory for now (from glennw:cef-close); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: f3dfe04fa45bd723fac40d1452550d55240f80f8
2015-01-19 07:57:47 -07:00
Martin Robinson
ff7e73d639 servo: Merge #4625 - Update to latest rust-azure and rust-layers (from mrobinson:surface-refactor); r=jdm
We no longer need to implement from_azure_surface in Servo, now that
rust-layers is handling more of the glue between rust-layers and Azure.

Source-Repo: https://github.com/servo/servo
Source-Revision: efae66bccb116ddf41857436718ef1556243a3f2
2015-01-16 12:57:44 -07:00
Glenn Watson
b4eb49dc3f servo: Merge #4641 - Update harfbuzz module (from glennw:update-hb); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 31627bdc9d698a31db1bcd47279d43de397298f1
2015-01-15 15:09:47 -07:00
Akos Kiss
6448be6dbd servo: Merge #4638 - Update to use latest mozjs-sys (from akosthekiss:pr-update-mozjs); r=jdm
As requested in https://github.com/servo/mozjs/pull/26

Source-Repo: https://github.com/servo/servo
Source-Revision: 772570d06b8a75f376cfb50b334de7dbaa5c0382
2015-01-15 09:48:48 -07:00
Josh Matthews
5546b54e9e servo: Merge #4635 - Use latest mozjs (from jdm:updatemozjs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ddf77a1cff3b55cf316fa08164e2bb262b618d02
2015-01-14 16:24:46 -07:00
Josh Matthews
44ecddf370 servo: Merge #4632 - Add handling for unreported exceptions when invoking callback objects (from jdm:reporterr); r=Ms2ger
Rebased version of #4399 that addresses points 2 & 5 from https://critic.hoppipolla.co.uk/showcomment?chain=9848 . Introduction of an AutoJSAPI equivalent and setting the error reporter to null will come later, as they are much larger changes and we're currently blocking any further updates to rust-mozjs that are unrelated to error reporting.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4bb5822f9189b7c04101ba2fdfc99535ecd4bc27
2015-01-14 12:30:49 -07:00
Glenn Watson
d4f90dfe6b servo: Merge #4626 - Update glutin and add hidpi methods (from glennw:hidpi); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 221275267e61870ca2bac904149c0b14c63c3ebe
2015-01-13 17:48:46 -07:00
Glenn Watson
fc10d3abee servo: Merge #4616 - Update png/harfbuzz, use prefixed symbol names (from glennw:update-png-hb); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 432b89f60f1dd7f9dc8d8a0621f4f6acec474a74
2015-01-13 14:06:48 -07:00
Glenn Watson
6db1005878 servo: Merge #4583 - Add support for multiple cef browsers (multiple tabs), in-process for now (from glennw:cef-tabs); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 9b6d979f19d9e6433cf7c1da0f52ffcc2dac02a6
2015-01-13 12:27:48 -07:00
Michael Wu
fcf0f879df servo: Merge #4599 - Make the gonk input code use standard file APIs (from michaelwu:use-file-apis-in-gonk); r=larsbergstrom
With the latest rustup, we can use std::io::File since as_raw_fd() is available.

Source-Repo: https://github.com/servo/servo
Source-Revision: d9a26ad595ee94361ce20064355fd77061eda625
2015-01-10 06:15:43 -07:00
Michael Wu
1a72b32a19 servo: Merge #4597 - Fix gonk build after the last rustup (from michaelwu:fix-gonk-20150109); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 5e758b680bac40de3350dda7678b02ce5ace7bda
2015-01-09 17:18:45 -07:00
Edit Balint
8eb66707e6 servo: Merge #4137 - CanvasRenderTask connected to Layout (from ebalint:canvas); r=jdm
Content of the canvas is drawn, tests/html/test_canvas.html now works.

Source-Repo: https://github.com/servo/servo
Source-Revision: da400a7a453eacf6f3089cc07e5dc61f385a0909
2015-01-09 12:06:47 -07:00
Patrick Walton
1d5c039eef servo: Merge #4557 - layout: Implement filter per CSS-FILTERS § 5 (from pcwalton:filter); r=mbrubeck
`blur` and `drop-shadow` are not yet supported, because the
`text-shadow` PR makes some fundamental changes to blur rendering that
are needed first.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: ffdbf29db28ba334e8baf8d35141b5e8ad289459
2015-01-09 09:03:48 -07:00
Manish Goregaokar
10ac47fbd8 servo: Merge #4570 - Fix Android warnings (from Manishearth:android-warn); r=jdm
My local android build is a bit wonky so I'm not sure if all warnings have been fixed, though. I'll try to poke around and fix it.

Source-Repo: https://github.com/servo/servo
Source-Revision: d9751c0fbb13d04b27c42a9ba5065b5af26f1286
2015-01-08 21:54:48 -07:00
Glenn Watson
fe52b6e9ec servo: Merge #4546 - Add ability to explicitly set static resources path, used by cef-linux (from glennw:cef-resources); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1699864f5339aaf463df5e2cf1d80193c3675e58
2015-01-08 15:27:54 -07:00
Ms2ger
e5578c14fd servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Michael Wu
1ee6ae7c6f servo: Merge #4565 - Fix gonk port bustage due to constellation_msg renaming (from michaelwu:fix-gonk-20150107); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 19cb0fa9e457c18b36944c2691c7491ee6eb9cd2
2015-01-07 16:21:52 -07:00
Matt Brubeck
257e1b9aac servo: Merge #4428 - Code cleanup in glfw_app::Window::scroll_window (from mbrubeck:scroll-cleanup); r=glennw
More code re-use, fewer unchecked units. r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: cf616b90a236f88058dbad74b568b4d4379d2829
2015-01-05 17:21:54 -07:00
Glenn Watson
2cfb62fafe servo: Merge #4552 - Update cocoa/glutin for mac mouse events fix (from glennw:update-glutin-cocoa); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 3c45973238eab6f85fcc5184e3edf7ad010428f8
2015-01-05 14:36:57 -07:00
Ms2ger
833bb336a1 servo: Merge #4550 - Rename MouseWindowEvent variants (from Ms2ger:MouseWindowEvent); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ca876edc051c9b105747252155d0f11c31189646
2015-01-05 08:09:53 -07:00
Patrick Walton
707d7cd93e servo: Merge #4460 - layout: Paint stacking contexts' overflow areas properly (from pcwalton:stacking-context-overflow); r=glennw
This was making `box-shadow` not show up in many cases, in particular,
but the effects were not limited to that.

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 499d17f564d699e5e290e8a3859f64e7536827a7
2015-01-04 18:51:48 -07:00
Ms2ger
11a0efe9f4 servo: Merge #4542 - Prepare for the rust upgrade (from servo:pre-rustup_20141221); r=saneyuki
In particular, this contains changes to qualify enums where rust will require it, and to stop using some features that will be removed.

Source-Repo: https://github.com/servo/servo
Source-Revision: ba8cf6b0e6145265f9472d4855f078d8b5943fe7
2015-01-04 12:39:47 -07:00
Ms2ger
19cd65303c servo: Merge #4538 - Remove obsolete attributes (from Ms2ger:attributes); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d8b6cec722e67f1fd39f154f4f0a298f2227501f
2015-01-03 10:39:48 -07:00
Manish Goregaokar
3615fd0c7e servo: Merge #4488 - Add a lint for usages of to_string() (from servo:into_string-lint); r=jdm
This is a rebase of #4366.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0da57abec6014f8a6edde9781598053deab996c7
2014-12-31 05:00:52 -07:00
Simon Sapin
be24ce4c79 servo: Merge #4455 - Start using the ToCss trait, to be used for CSS serialization (from servo:to_css); r=jdm
See https://github.com/servo/rust-cssparser/pull/67 and https://github.com/servo/servo/issues/4440.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: b3059ee85b71b067e4b9e337faef53ae4a96c66d
2014-12-29 16:33:41 -07:00
Ms2ger
1d0d6c95fb servo: Merge #4467 - Implement HTMLElement.dataset (from servo:dataset); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 0e6304dcf7fd6712f4455151b55a361de857359d
2014-12-25 02:27:43 -07:00
Josh Matthews
9030c2e368 servo: Merge #4478 - Fix HTTPS fetches (from jdm:hyperssl); r=larsbergstrom
This just updates rust-openssl and hyper to use cherry-picked commits that fix this particular issue. I think it's worth it because the experience of trying Servo for the first time right now is pretty terrible.

Source-Repo: https://github.com/servo/servo
Source-Revision: 070008b4c43337b3ef4ef78b09f73e64b4d0be23
2014-12-24 11:15:45 -07:00
Glenn Watson
a20334edde servo: Merge #4461 - Use event polling instead of blocking when outputting to a file (from glennw:glutin-tests); r=larsbergstrom
This stops some ref tests on linux blocking while waiting for
user input events and never outputting the file.

Also mark vertical writing test as flaky on all platforms. Due
to unrelated timing reasons, this fails reliably on mac when glutin
is enabled. The related bug with details on the root cause is #3926.

Source-Repo: https://github.com/servo/servo
Source-Revision: b83b4932dac9c0f4fbd6ad6a5b5a0232362c504b
2014-12-22 17:57:46 -07:00
Glenn Watson
5b73010ac9 servo: Merge #4442 - glutin - Add support for waking up blocked event loop, and smooth resize on mac (from glennw:glutin-events-resize); r=larsbergstrom,larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 20b961493ac73abbb5260f93f550692cb9ef8fec
2014-12-22 14:33:45 -07:00
Michael Wu
e9ef591f66 servo: Merge #4448 - Make gonk port build again after the last rustup (from michaelwu:fix-gonk-20141220); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 1793e0cb0e0acb1de0a6efe9430006b72acc5eda
2014-12-21 12:18:46 -07:00
Ms2ger
8e3ecf0d97 servo: Merge #4446 - Remove unused libgreen import (from Ms2ger:green); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 58e7b8c154cae663ee82b6c042044de68c43a007
2014-12-19 14:03:44 -07:00
Glenn Watson
61026a418e servo: Merge #4438 - Update cargo nightly to get android cross compile fix. Also add stub tra (from glennw:android-fix-1); r=metajack
...it method to glutin port.

Source-Repo: https://github.com/servo/servo
Source-Revision: 465b38c03f8565f3cf3d22e3b7f98f51b116e2e4
2014-12-18 17:01:10 -07:00
Patrick Walton
c36d533145 servo: Merge #4394 - layout: Implement clip per CSS 2.1 § 11.1.2 (from pcwalton:clip); r=SimonSapin
Only the recommended, comma-separated syntax is supported.

r? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: a80d88897d176630c79f929e8b1fd661b2e1a17c
2014-12-18 14:12:51 -07:00
Simon Sapin
b308cce0c9 servo: Merge #4420 - Fix warnings (from servo:fix-warnings); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: eea49ee1d986c306a8eec32b64be9b10cb2278fc
2014-12-18 04:42:50 -07:00