Commit Graph

209 Commits

Author SHA1 Message Date
Ankit Agrawal
67d93f2be4 servo: Merge #5102 - Add profiling to image decoding (from servo:profile-img); r=jdm
This extracts some independently useful parts of
<https://github.com/servo/servo/pull/4215>.

Source-Repo: https://github.com/servo/servo
Source-Revision: 16bc4749af685c7a1728858c15ead011ab415615
2015-02-28 11:46:02 -07:00
Jack Moffitt
10158ea9a8 servo: Merge #5078 - Update to latest Cocoa (from metajack:cocoa-hotifx); r=jdm
This fixes Servo in release mode on OS X.

Source-Repo: https://github.com/servo/servo
Source-Revision: 24139a21e8dabf5d1b16773a3a7a1919aa2655fd
2015-02-26 08:39:54 -07:00
Nicholas Nethercote
c46175ed5f servo: Merge #4894 - Read smaps in the memory profiler on Linux (from nnethercote:read-smaps); r=jdm
Here's example -m output after these changesets are applied:

```
_size (MiB)_: _category_
     2798.61: vsize
      136.80: resident
      142.89: resident-according-to-smaps
       97.84: - anonymous (rw-p)
       23.98: - /home/njn/moz/servo/components/servo/target/servo (r-xp)
        6.58: - [heap] (rw-p)
        5.36: - other
        3.51: - /usr/lib/x86_64-linux-gnu/dri/i965_dri.so (r-xp)
        1.33: - /lib/x86_64-linux-gnu/libc-2.19.so (r-xp)
        0.93: - /home/njn/moz/servo/components/servo/target/servo (r--p)
        0.76: - /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20 (r-xp)
        0.74: - /usr/lib/x86_64-linux-gnu/libX11.so.6.3.0 (r-xp)
        0.50: - /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 (r-xp)
        0.50: - /lib/x86_64-linux-gnu/libglib-2.0.so.0.4200.1 (r-xp)
        0.45: - /usr/lib/x86_64-linux-gnu/mesa/libGL.so.1.2.0 (r-xp)
        0.43: - /lib/x86_64-linux-gnu/libm-2.19.so (r-xp)
       30.85: system-heap-allocated
        4.91: jemalloc-heap-allocated
        6.11: jemalloc-heap-active
      120.00: jemalloc-heap-mapped
```
The `resident-according-to-smaps` line is new, as are all the indented lines beneath it. This is useful particularly because it shows how much memory is taken up by code, e.g. the line ending in `servo (r-xp)` shows that the `servo` executable's code alone takes up 24 MiB of physical memory.

Source-Repo: https://github.com/servo/servo
Source-Revision: eb7e86ac4e21334e807a81ed01348a82ac7610b5
2015-02-23 19:54:50 -07:00
Simon Sapin
40036d9f8a servo: Merge #5010 - Move selector matching to an external library, for use outside Servo (from SimonSapin:external-selectors); r=larsberg
The new library is https://github.com/servo/rust-selectors. It’s not quite ready for other users (the API needs work), but this is a first step.

https://github.com/servo/rust-selectors/pull/2 should also be reviewed.

Fixes #3669.

Source-Repo: https://github.com/servo/servo
Source-Revision: 91abf5557b1a324d6568ce08cfb92cdffca10e41
2015-02-23 08:39:47 -07:00
Patrick Walton
c89b718f8e servo: Merge #5016 - script: Implement enough 2D canvas support to render basic SVGs such as (from jdm:canvas-for-svg); r=jdm
the tiger.

Rebased from #4623.

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

--HG--
rename : servo/components/script/dom/webidls/HTMLHeadElement.webidl => servo/components/script/dom/webidls/CanvasPattern.webidl
2015-02-22 20:33:45 -07:00
Ms2ger
f158c18736 servo: Merge #5024 - Fix build warnings in CEF (from Ms2ger:cef-warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 21a6633898d244595dc3bcf8b10ed859bca96e2e
2015-02-22 15:57:43 -07:00
Prabhjyot Singh Sodhi
56b7bb7f35 servo: Merge #5012 - using opts::default_opts() in cef/core.rs (from psdh:defopts); r=jdm
Fixes #5002

Source-Repo: https://github.com/servo/servo
Source-Revision: 2271de3d5be0adbe6dcdcbfbbc480a3d39b8a321
2015-02-22 13:15:44 -07:00
yodalee
5da0bd9faa servo: Merge #5003 - update mozjs-sys to newest (from yodalee:update-mozjs-sys); r=Ms2ger
update mozjs-sys after rust-mozjs

Source-Repo: https://github.com/servo/servo
Source-Revision: d368d70f14474c5c0460d0d06f163c390cff60bd
2015-02-21 10:06:48 -07:00
Ms2ger
9c6ed590bc servo: Merge #5000 - Move gfx to libc from crates.io (from Ms2ger:libc-gfx); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bc5eeb00a1874c7211d6a656871000f9352c2f40
2015-02-21 06:51:50 -07:00
yodalee
919ae8d751 servo: Merge #4998 - update mozjs and rust-mozjs to newest (from yodalee:update-mozjs-and-rustmozjs); r=Ms2ger
All javascript Typedarray supported.

Source-Repo: https://github.com/servo/servo
Source-Revision: b548fb8f58c03a7ebb6573049ec72a516eb9282d
2015-02-21 02:51:48 -07:00
Patrick Walton
150bdee4d8 servo: Merge #4994 - layout: Add an option to visualize parallel layout (from pcwalton:layout-tinting); r=pcwalton
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: d26345f868e4261760ce204bdc383941e8f14621
2015-02-20 23:06:48 -07:00
Manish Goregaokar
12185fd3bc servo: Merge #4991 - Add ./mach build-gonk; unbreak gonk build; document (from Manishearth:gonkup); r=larsbergstrom
r? @larsbergstrom

cc @mwu

Source-Repo: https://github.com/servo/servo
Source-Revision: d326e75c5e0314903ed2d297dcb72e535c543c2f
2015-02-20 22:27:49 -07:00
Andreas Gal
e3a7b4c06d servo: Merge #4977 - Use cleaner StrokeOptions interface (from andreasgal:master); r=jdm
The new interface will be added by https://github.com/ser...vo/rust-azure/pull/145 (has to be merged first).

Source-Repo: https://github.com/servo/servo
Source-Revision: 991b47953197ef5311300145e7b3d6f249a3f6b5
2015-02-20 21:00:55 -07:00
Ms2ger
b801182c59 servo: Merge #4993 - Move compositing to libc from crates.io (from Ms2ger:libc-compositing); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d8c9f2b92fb4be83895c4fe43ede2d6e83d2c274
2015-02-20 18:21:51 -07:00
Ms2ger
6f16c7dd57 servo: Merge #4975 - Move util to libc from crates.io (from Ms2ger:util-libc); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 0a4c8c0e4c0e8c94a82363b10971c99fc0d9abbc
2015-02-20 01:42:53 -07:00
Jack Moffitt
aaef4c20a3 servo: Merge #4969 - Added overlay for demoing parallel painting (from servo:parallel-paint-demo); r=glennw
You can enable this with `-Z show-parallel-paint`. The output looks like this:

![screenshot 2015-02-19 13 21 12](https://cloud.githubusercontent.com/assets/28357/6275199/7bd6e788-b83a-11e4-89cb-a74f360272f2.png)

Source-Repo: https://github.com/servo/servo
Source-Revision: 49ff6b2ccc43ab657814a1b4584122411a4b2acb
2015-02-19 16:21:57 -07:00
Ms2ger
7d0de0bb3d servo: Merge #4970 - Move layout to libc from crates.io (from Ms2ger:js-layout); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: f769626dd2e351c8b408b39bfac6f6cbd53581a9
2015-02-19 13:43:00 -07:00
Ms2ger
d434c04486 servo: Merge #4963 - Move js to libc from crates.io (from Ms2ger:js-libc); r=jdm
Requires https://github.com/servo/rust-mozjs/pull/136.

Source-Repo: https://github.com/servo/servo
Source-Revision: d94bd278a4a6e5ef38a9967be69ada0f1bf50f6d
2015-02-19 12:03:54 -07:00
Ms2ger
fbf983ef98 servo: Merge #4962 - Remove the libc feature gate from cef (from Ms2ger:cef-libc); r=jdm
As it depends on the crates.io libc crate, the feature gate doesn't apply.

Source-Repo: https://github.com/servo/servo
Source-Revision: e0af48426980dd067dba00c98d6c2e9b8ebe1695
2015-02-19 06:45:52 -07:00
Glenn Watson
92351aa8e2 servo: Merge #4951 - Change window title to reflect document title (from glennw:set-title); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: dc31d96f65246def19cb7a23f3a62795cd7344a1
2015-02-18 14:42:49 -07:00
thiagopnts
641741cfab servo: Merge #4943 - Remove warning (from thiagopnts:remove-warnings); r=gw
Remove warning from unused import

Source-Repo: https://github.com/servo/servo
Source-Revision: 25678f9c2f220fbbfaad61e3d3b53aa39428d53b
2015-02-18 14:00:58 -07:00
Ms2ger
057d7cb476 servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f
2015-02-17 07:30:50 -07:00
Manish Goregaokar
051e813fd0 servo: Merge #4946 - Update to latest glutin (from Manishearth:glutin_up); r=gw
Also moves some of our deps away from rustc's libc and onto Crates libc.

Needs:

 - https://github.com/servo/rust-azure/pull/144
 - https://github.com/servo/rust-xlib/pull/35
 - https://github.com/servo/gleam/pull/14
 - https://github.com/servo/rust-layers/pull/151

Source-Repo: https://github.com/servo/servo
Source-Revision: 4ab928728e3d65ac4c6ca72cd6c8aa0c75fde33b
2015-02-17 00:18:49 -07:00
Bryan Bell
931cd7e602 servo: Merge #4896 - When using glutin, set the mouse cursor (from bjwbell:mouse-cursor); r=glennw
r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: a848a00a1db2c57f59509efc4165d8e04e89bb53
2015-02-16 14:54:49 -07:00
Glenn Watson
4ddf1f39c5 servo: Merge #4934 - Fixes background-color calculation for iframes. Fixes #1248 (from glennw:fix-1248); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d2e840bf49f7d9d8022ab2566cfb641dd578a44
2015-02-16 14:06:52 -07:00
Ms2ger
7341b3a564 servo: Merge #4932 - Fix a build warning with CEF on Mac (from Ms2ger:warning-cef-mac); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b2f2c55057493a6d6b1b56d02173625fbe403a8
2015-02-15 13:45:52 -07:00
Adenilson Cavalcanti
4a6230be7e servo: Merge #4903 - Companion single Color patch (from Adenilson:singleColor02); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b5749e9855b68636d5366450602cd73397a6f219
2015-02-13 15:51:50 -07:00
Ms2ger
c1db4c4e1b servo: Merge #4924 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9c476a290aa493404a8e5953d0e813cb68c4c434
2015-02-13 07:36:50 -07:00
Ms2ger
b019c7ef30 servo: Merge #4922 - Fix some warnings (from servo:warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 66f4faf44fbc6e8703d4336219a20dd3b19fb493
2015-02-13 05:33:49 -07:00
hgentry
f27db51a13 servo: Merge #4890 - Remove our copy of Utf16Encoder in favor of the built-in equivalent (fixes #4725) (from servo:Utf16Encoder); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 395323cd70cad05f43617e9ef95f4db71df05d71
2015-02-12 09:18:46 -07:00
Simon Sapin
da87abc762 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

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

--HG--
rename : servo/ports/gonk/build.rs => servo/support/rust-task_info/build.rs
2015-02-11 17:24:45 -07:00
Martin Robinson
9a7b554da0 servo: Merge #4895 - Send back unused buffers to the right pipeline (from mrobinson:fix-buffer-return); r=mbrubeck
Update to latest rust-layers and send back all buffers to their
original pipeline.

Source-Repo: https://github.com/servo/servo
Source-Revision: bc6882bdefc318402a46ede1494eb79339705c21
2015-02-11 09:27:54 -07:00
Ms2ger
e80f986397 servo: Merge #4887 - Import net as net rather than servo_net (from Ms2ger:servo_net); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: e3a4d493117ffd09ce75270b36012845ebb9c08c
2015-02-10 05:15:45 -07:00
Ms2ger
37b5782606 servo: Merge #4886 - Import msg as msg rather than servo_msg (from Ms2ger:servo_msg); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 29d3b872de4abb693b75e71fc0b987c52b0fd1f6
2015-02-10 03:51:46 -07:00
Josh Matthews
7b3305eafe servo: Merge #4881 - Allow unused variables, imports, and mutable (from jdm:allowunused); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 7048291dc0db4efecf9c13779feeb5e022210123
2015-02-09 16:45:47 -07:00
Manish Goregaokar
49c6598243 servo: Merge #4864 - Gonk upgrade (from Manishearth:gonkup1); r=larsbergstrom
This does a rustup to our current rustc.

Gonk now compiles, but doesn't run. Trying to fix this, but thought I'd PR my progress.

This needs a couple of things to work:

 - An override of time  (7f105d4dd2), with `timegm(struct tm *tm)`  from `src/time_helpers.c` commented out
 - An override of openssl (1a60bccb6a), with [this patch](http://hastebin.com/onovacofuj.diff)
 - An override of gl-rs (230e6c9ed6), with submodules updated. This is because the lockfile is messed up due to conflicting github and registry deps. While I could fix this by forking things, this goes away next rustup anyway (the deps all move to a common source), so I just worked around it with a clone.
 - Env vars similar to [this](http://hastebin.com/hawadubolu.bash)
 - After the last failed link step, run `../../mach rustc` with the same args (extracted from `../../mach cargo -v`), along with `-C link-args="$LDFLAGS -lGLESv2 -L $GONKDIR/backup-flame/system/lib/"`
 - (Steps for creating a B2G build [here](https://www.irccloud.com/pastebin/VG2lHBVP))

r? @larsbergstrom

(No need for a merge, just a check on the unsafe stuff would be fine)

Source-Repo: https://github.com/servo/servo
Source-Revision: 11edfdc9353362161b0ff9a654d61dccd1d438f0
2015-02-07 09:09:43 -07:00
Simon Sapin
73c21f832d servo: Merge #4856 - Use the ToCss trait instead of Show for CSSOM serialization (from servo:tocss); r=jdm
r? @jdm

The in-progress Rust upgrade will go on top of this.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5cb1690bfa20c1eccffe2f94a2155d2321e69fa
2015-02-06 17:21:42 -07:00
Josh Matthews
21a974a25d servo: Merge #4519 - Cookie support (from jdm:cookies); r=Ms2ger
As specified in http://tools.ietf.org/html/rfc6265. Requires https://github.com/servo/cookie-rs/pull/1. Tested against http://www.joshmatthews.net/cookie.php, http://www.html-kit.com/tools/cookietester/, https://github.com/login, and https://mobile.twitter.com/session/new .

Source-Repo: https://github.com/servo/servo
Source-Revision: 7e3f504d94ffb77ec6148166d2ab73978e1c71c8
2015-02-04 11:57:54 -07:00
Glenn Watson
9ee75ca55d servo: Merge #4830 - Load android OpenGL pointers (fixes #4824) (from glennw:android-gl); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: a766f1a7060d367ad1f564b2a0fcbd45c8accb63
2015-02-03 19:45:49 -07:00
Matt Brubeck
3b8af1ec2c servo: Merge #4826 - Add [no_link] attribute to plugins crate (from mbrubeck:cef_plugins); r=jdm
Fixes errors linking to our CEF embedding library. r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 95802fe8b372727572d0557cb783dc807dfe2c29
2015-02-03 19:03:50 -07:00
Alexandru Cojocaru
24ca70cf6f servo: Merge #4820 - add unwrap to send/recv calls (from servo:send-recv); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 8e6dcc7c26d88bb0452226ff8c34539e368e03d9
2015-02-03 11:24:53 -07:00
Martin Robinson
6c95f2190b servo: Merge #4809 - Update to latest rust-layers (from mrobinson:rust-layers-update); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 6eac20d84da2b5f0741a91b5af3907af56b009b0
2015-02-02 16:57:51 -07:00
Glenn Watson
4ba063a3b5 servo: Merge #4798 - Remove the glfw port (it doesn't compile since last rustup anyway) (from glennw:remove-glfw); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 896cdcb96a98d4b4858d24806ee67db6f63c9fb1
2015-02-02 01:30:50 -07:00
Simon Sapin
1907f13c33 servo: Merge #4794 - Fix mod_path dependency in CEF and Gonk builds (from servo:fix-mod_path); r=jdm
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 6d06a0075777d70c5d5dd99105210a356fabd2fb
2015-01-31 15:27:50 -07:00
Manish Goregaokar
62228ef5fe servo: Merge #4741 - Basic certificate verification (from Manishearth:cert-checking); r=jdm
For now, this can only be tested by replacing `resources/certs` with `resources/cert-google-only` (an Equifax certificate -- will work for Google but not Wikipedia or Stack Exchange)

I can replace the error page with something less frivolous, but since we already have the "I tried" star (and this stuff is the job of the chrome anyway), I thought this would be more fun to have.


This also contains a partial hyper upgrade.

Fixes #4119

Source-Repo: https://github.com/servo/servo
Source-Revision: 2010fbf0ddabdaf3bcb52c5f2075e7d994fc63ec
2015-01-31 03:42:48 -07:00
Josh Matthews
114f6b6b27 servo: Merge #4788 - Lock crates.io dependencies to specific versions (from jdm:cargodeps); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 66384dfcfd4c38595985cd3fac12fa616a2ba94f
2015-01-30 17:36:50 -07:00
Simon Sapin
f19ec826ce servo: Merge #4757 - Bring CSS parse error reporting back (from servo:newnewnewcss); r=mbrubeck
(Still off by default. Enable with `RUST_LOG=style`.)

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: 172aed535be3c34775824dac64ad2b91fc379ad5

--HG--
rename : servo/components/style/properties/mod.rs.mako => servo/components/style/properties.mako.rs
2015-01-30 15:27:53 -07:00
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