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

411 Коммитов

Автор SHA1 Сообщение Дата
Mátyás Mustoha c674f12d72 servo: Merge #5635 - Canvas: added lineCap and lineJoin support (from mmatyas:canvas_linecapjoin); r=jdm
This patch adds support for setting the line cap and join. However, it seems there's a problem on the azure-side, as the line cap setting doesn't work. Changing either the default values or using the new function has no effect. Line join works fine though.

Source-Repo: https://github.com/servo/servo
Source-Revision: fe81ce942a36b08ece8ef6d58de72624a961eeaa
2015-04-14 12:57:48 -05:00
Brian Anderson ea12dc1c9e servo: Merge #5489 - Rebase and rustup of brson's cleanup work (from larsbergstrom:brson_cleanup); r=metajack,ms2ger,jdm,manish
All of the commits by brson have been reviewed. Just the android fixups and Rustup one (which also cleans up some of the duplication due to a complete rewrite of code that had been moved in the original PR).

Source-Repo: https://github.com/servo/servo
Source-Revision: 72a0fb683871365e86febbefb72be9fb136381af
2015-04-14 10:56:01 -05:00
Ms2ger ab055a7596 servo: Merge #5661 - Stop using int/uint in CEF (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c42c2ae9b57b5960ce617e5b4c0ab75959e46957
2015-04-13 09:17:44 -05:00
Ms2ger e9817abe10 servo: Merge #5662 - Remove some as_slice calls in cef (from Ms2ger:cef-core); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: d16b102416128015a2a3296af69ed75195f3bd05
2015-04-13 08:45:22 -05:00
Patrick Walton 4870b4bc1c servo: Merge #5634 - Improve scrolling performance (from pcwalton:fix-scrolling-perf); r=metajack
This goes hand in hand with servo/glutin#18 to get our scrolling performance back on Mac.

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: f017a4459c4d1067dec74ce1bf00cc6ce0612859
2015-04-11 11:02:32 -05:00
Ms2ger 4d9fea7634 servo: Merge #5632 - Create a Runtime struct (from Ms2ger:runtime); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 35fb5166624faa13d8a7090ce3f2456726547e11
2015-04-10 08:44:38 -05:00
Keith Yeung 02c0bba5a2 servo: Merge #5599 - Implement TextDecoder (from servo:textdecoder); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 254f2a3b5fb0ef59eff4b24cbf0f5c6ca90c4317
2015-04-08 20:00:40 -05:00
Ms2ger 4e3e099b14 servo: Merge #5570 - Cleanup cef/wrappers.rs (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 37b67388846649da194bee653fa271963a9ee590
2015-04-08 15:04:20 -05:00
Jag Talon 20a6cab60b servo: Merge #5527 - opts.rs: don't accept multiple URLs. Fixes #5520 (from jagtalon:jag/multiple-urls); r=mbrubeck
Switched from opts.urls from being of type Vec to type String and changing the name to `url` as well. Changed the other files that are using opts.urls accordingly.

Source-Repo: https://github.com/servo/servo
Source-Revision: df57af1fc41814389ab246f9a199ab868b1ecd74
2015-04-07 22:08:33 -05:00
Diego Marcos 5cfb1364bd servo: Merge #5433 - Implements drawImage for html image as ImageSource (from dmarcos:issue5290); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 58637a1174f94cb1ebbb394d3ba3c8c8f2d70639

--HG--
rename : servo/tests/html/test_canvas_drawimage.html => servo/tests/html/test_canvas_drawimage_canvas.html
2015-04-07 18:38:34 -05:00
Josh Matthews 46eb131dd4 servo: Merge #5415 - Get the barest bones of webdriver integration ready for keeners (from jdm:webdriver); r=jdm
Requires https://github.com/jgraham/webdriver-rust/pull/6.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1f57c6d74acd50077eb015bdebffd2adac1e552e
2015-04-06 22:09:44 -05:00
Matt Brubeck 590a7bc62f servo: Merge #5461 - Implement the :focus pseudo-class selector and element.focus/blur (from mbrubeck:focus); r=jdm
Fixes #5460. This supports for simple focusable elements that are their own DOM anchors, like text `input` fields.

Requires servo/rust-selectors#20.  r? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: b63fb0c0a7e9cd9208d66319c910750aaaac844c
2015-04-04 18:21:48 -06:00
Manish Goregaokar ab1238f36e servo: Merge #5465 - Split out shared networking code into net_traits crate (from gilles-leblanc:issue-4476-b); r=jdm
Fixes #4476

Source-Repo: https://github.com/servo/servo
Source-Revision: d707d1b78e3393a1ed164af8ec855bd0ff119e55

--HG--
rename : servo/components/net/image/test.jpeg => servo/components/net/test.jpeg
rename : servo/components/net/image/base.rs => servo/components/net_traits/image/base.rs
rename : servo/components/net/image/holder.rs => servo/components/net_traits/image/holder.rs
rename : servo/components/net/local_image_cache.rs => servo/components/net_traits/local_image_cache.rs
2015-04-03 13:00:46 -06:00
Ms2ger ea571b116f servo: Merge #5502 - Remove the unsafe impl Send for ConstellationControlMsg (from Ms2ger:impl-send); r=jdm
This impl made it possible to put raw pointers in ConstellationControlMsg and
send them across threads without considering the consequences.

This required making SmallVec1<T> Send if T is Send.

Source-Repo: https://github.com/servo/servo
Source-Revision: 74f8c0eeb714fb7ca7964b36f1b82849e8a345ee
2015-04-03 09:48:42 -06:00
Ms2ger e137b3f89d servo: Merge #5492 - Introduce a MouseButton enum (from Ms2ger:MouseButton)
Source-Repo: https://github.com/servo/servo
Source-Revision: 02be76bd4855a226669e8fcd1a638ff53e8f83d5
2015-04-03 13:29:12 +02:00
Matt McCoy 42af0e0dfc servo: Merge #5299 - Add HTTP compression (from mattnenterprise:http_compression); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: dbd16932e67c63a778362f71be028132279d5e91
2015-04-01 22:15:37 -06:00
Mátyás Mustoha f0707cb664 servo: Merge #5414 - Canvas: added arcTo() support (from mmatyas:canvas_arcto); r=jdm
Based on the implementation in Firefox.

After comparing how `arcTo` works in different browsers, I've found the code in Firefox the cleanest implentation. It also performed better on some test, for example the one on [this site](http://flashcanvas.net/examples/dl.dropbox.com/u/1865210/mindcat/arcto.html). In (Linux) Firefox 36, it looks like [this](http://i59.tinypic.com/2ch5b2d.png), while in Chromium 41, [some features are missing](http://i58.tinypic.com/30u5w8z.png).

Source-Repo: https://github.com/servo/servo
Source-Revision: ae31d9d9e86eb90a1fe2858f10ca5e6e2e722c67
2015-04-01 15:00:43 -06:00
Patrick Walton 550beef758 servo: Merge #5278 - gfx: Perform more aggressive caching in `FontContext::get_layout_font_group_for_style()` (from pcwalton:font-group-caching); r=glennw
There are several optimizations here:

* We make font families atoms, to allow for quicker comparisons.

* We precalculate an FNV hash of the relevant fields of the font style
  structure.

* When obtaining a platform font group, we first check pointer equality
  for the font style. If there's no match, we go to the FNV hash. Only
  if both caches miss do we construct and cache a font group. Note that
  individual fonts are *also* cached; thus there are two layers of
  caching here.

15% improvement in total layout thread time for Facebook Timeline.

r? @glennw (since you last worked on `get_layout_font_group_for_style()` IIRC)

Source-Repo: https://github.com/servo/servo
Source-Revision: ba0d28e0023fce2003d64b9caf97fcdbeb7cdb28
2015-04-01 10:00:52 -06:00
Patrick Walton c9e2901806 servo: Merge #5400 - layout: Implement CSS transitions per CSS-TRANSITIONS § 2 (from pcwalton:transitions-redux); r=glennw
Transition events are not yet supported, and the only animatable
properties are `top`, `right`, `bottom`, and `left`. However, all other
features of transitions are supported. There are no automated tests at
present because I'm not sure how best to test it, but three manual tests
are included.

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: ebdf1d494b6c986e6dfcb7d8fd3f0ffa126523ed
2015-03-31 10:39:56 -06:00
Adenilson Cavalcanti 72521a0339 servo: Merge #5366 - Load a placeholder when a url to an image is broken (from Adenilson:loadPlaceholder01); r=jdm
I decided to use the old Netscape broken image link icon (later we may
replace the image asset for something more trendier).

Source-Repo: https://github.com/servo/servo
Source-Revision: 1e282d55d7e36f0e488a395b90e961e9200c3817
2015-03-30 12:40:12 -06:00
Ms2ger 07a6ecf941 servo: Merge #5453 - Remove an unused import (from Ms2ger:unused-import); r=glennw
I accidentally left it in after removing the calls to stdout/stderr in
d926b8342b492cfa442a72b4d4da01e7e23d9cba.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5ead929fea34ca6d05d6bc4f0a07eeab4dfae207
2015-03-30 09:46:07 -06:00
Ms2ger 61c91ab321 servo: Merge #5444 - Fix gonk warnings (from servo:gonk-warnings); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: acf98dcccdd0affce6346ebf1f6187b2e07761dc
2015-03-29 17:54:59 -06:00
Brandon DeRosier 29ee916a7f servo: Merge #5422 - Use box syntax instead of Box::new() (from bdero:bdero/box-syntax); r=jdm
Closes #5417

Source-Repo: https://github.com/servo/servo
Source-Revision: 39556cc8328793478c0e34ff99e2d36d1ab4f5cb
2015-03-29 17:10:01 -06:00
Corey Farwell f68ba10506 servo: Merge #5447 - Remove some unnecessary uses of `as_slice` (from frewsxcv:as-slice); r=jdm
For the majority of these cases, `as_slice` can be removed due to
`Deref`. In particular, `Deref` for:

* `String` -> `str`
* `Atom` -> `str`

The latter of those two requires, a bump of the locked `string-cache`
library

Source-Repo: https://github.com/servo/servo
Source-Revision: 0fd41847a39be387c03bd5d8b6f2aec2b1bb6f66
2015-03-29 14:52:02 -06:00
Michael Wu ef4d622eec servo: Merge #5442 - Fix more gonk warnings (from servo:fix-more-gonk-warnings); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d3574b583d1c6b4bd591c8174918829a1c559c2
2015-03-29 05:49:01 -06:00
Ms2ger 9b8d5ae6d3 servo: Merge #5383 - Update js (from Ms2ger:update-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 37a98e40b8b78d88360aa3f856a6c966332e5f51
2015-03-26 12:18:55 -06:00
Nicholas Nethercote 7f03c21505 servo: Merge #5348 - Rename lots of profiling-related things (from nnethercote:profiler-renaming); r=jdm
```
------------------------------------------------------------------------
BEFORE                              AFTER
------------------------------------------------------------------------
util::memory                        util::mem
- heap_size_of                      - heap_size_of (unchanged)
- SizeOf                            - HeapSizeOf
  - size_of_excluding_self            - heap_size_of_children

prof::mem                           prof::mem
- MemoryProfilerChan                - ProfilerChan
- MemoryReport                      - Report
- MemoryReportsChan                 - ReportsChan
- MemoryReporter                    - Reporter
- MemoryProfilerMsg                 - ProfilerMsg
  - {R,UnR}egisterMemoryReporter      - {R,UnR}egisterReporter
- MemoryProfiler                    - Prof
- ReportsForest                     - ReportsForest (unchanged)
- ReportsTree                       - ReportsTree   (unchanged)
- SystemMemoryReporter              - SystemReporter

prof::time                          prof::time
- TimeProfilerChan                  - ProfilerChan
- TimerMetadata                     - TimerMetadata (unchanged)
- Formatable                        - Formattable [spelling!]
- TimeProfilerMsg                   - ProfilerMsg
- TimeProfilerCategory              - ProfilerCategory
- TimeProfilerBuckets               - ProfilerBuckets
- TimeProfiler                      - Profiler
- TimerMetadataFrameType            - TimerMetadataFrameType (unchanged)
- TimerMetadataReflowType           - TimerMetadataReflowType (unchanged)
- ProfilerMetadata                  - ProfilerMetadata (unchanged)
```
In a few places both prof::time and prof::mem are used, and so
module-qualification is needed to avoid overlap, e.g. time::Profiler and
mem::Profiler. Likewise with std::mem and prof::mem. This is not a big
deal.

Source-Repo: https://github.com/servo/servo
Source-Revision: d784d9c488be4533a3590a154addd366d15a5864
2015-03-25 21:18:48 -06:00
Glenn Watson 1200ff0934 servo: Merge #5339 - Add mozbrowser events for location + title change (from glennw:moz-events); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 644dc405863cc5cdf7c562588cdd05c40d00ee35
2015-03-25 13:39:49 -06:00
Mátyás Mustoha 34409fd616 servo: Merge #5302 - Canvas: Added stroke support (from mmatyas:canvas_stroke); r=jdm
This is the servo side patch of servo/rust-azure#149.

Source-Repo: https://github.com/servo/servo
Source-Revision: f29ea4e4ef633c023a43f47f7fc8c6b46e51b8df
2015-03-25 07:54:50 -06:00
Glenn Watson 58a59a03a9 servo: Merge #5350 - Fixes #4964 and #4965 (from glennw:glutin-fixes); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 2926963045f505b5cf88fd433c696c9edfb829ae
2015-03-24 21:57:48 -06:00
Nicholas Nethercote f9758aa688 servo: Merge #5335 - Move profiler code from `util` into a new crate `profile` (from nnethercote:profile-crate); r=glennw
- Most of util::memory has been moved into profile::mem, though the
  `SizeOf` trait and related things remain in util::memory. The
  `SystemMemoryReporter` code is now in a submodule
  profile::mem::system_reporter.

- util::time has been moved entirely into profile::time.

Source-Repo: https://github.com/servo/servo
Source-Revision: d1268ec9c6633684270015e7b2619181aeb47b8b

--HG--
rename : servo/components/util/time.rs => servo/components/profile/time.rs
2015-03-24 03:15:49 -06:00
Ms2ger 58cb86389f servo: Merge #5317 - Fix some warnings in the CEF port (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 092a6d6f10216470c118e0efbb1ce969ce2864a3
2015-03-23 04:15:50 -06:00
Ms2ger c90dcd40b6 servo: Merge #5301 - Modernize reftest.rs (from Ms2ger:reftests); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 87af57cefc671f445c5b977f2b27d7ca9e70e390
2015-03-21 13:42:45 -06:00
Ms2ger 01a90574bd servo: Merge #5288 - Fix various build warnings (from Ms2ger:warnings); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 0663cd632517c9a9c86db47456c5a4da637045ed
2015-03-20 11:00:54 -06:00
Ms2ger ce96136abb servo: Merge #5287 - Update some feature gates (from Ms2ger:gates); r=jdm
CC #5286.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6ffd459479dde59f471eb42ef0515dd964b6a9d9
2015-03-20 09:12:51 -06:00
Mátyás Mustoha 1bf28c3915 servo: Merge #4891 - Implement canvas gradient (from mmatyas:canvas_gradient); r=jdm
Based on [ebalint](https://github.com/ebalint)'s original patch, this commit implements the linear and radial gradients for the canvas. The PR also includes test cases.
Depends on #4623 and servo/rust-azure#136.

Source-Repo: https://github.com/servo/servo
Source-Revision: dea36f981650f027902b4f71f0cdabd2da69fe21
2015-03-20 03:12:47 -06:00
Matt Brubeck e555e46c85 servo: Merge #5280 - Use the same version of rand everywhere (from mbrubeck:rand); r=larsbergstrom
r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 794d9f696a7a1c80afec44badfb151c047239cd7
2015-03-19 17:33:48 -06:00
Jack Moffitt e0618abf79 servo: Merge #5276 - Switch from poll_events to wait_events (from metajack:fix-idle-loop); r=pcwalton
This fixes 100% CPU usage during idle.

Source-Repo: https://github.com/servo/servo
Source-Revision: e845695b6674a8f97f6a172bf575e6c965883ff1
2015-03-19 12:03:52 -06:00
Michael Wu 0870d37be3 servo: Merge #5272 - Fix warnings in gonk port (from michaelwu:fix-gonk-warnings); r=metajack
This fixes a bunch of warnings in the gonk code. Not all of them, but we're only left with three now.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8906d485703a5c975bcd6709c8ad9c25a51e1e8f
2015-03-19 08:48:52 -06:00
Simon Sapin 79a6daaf67 servo: Merge #5262 - Fix some post-rustup warnings (from servo:fix-warnings); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 124a78fb2e4d324a7d0ed54da1cca17839d406b7
2015-03-18 15:21:49 -06:00
Bryan Bell 037c151d73 servo: Merge #5088 - Enable osx cursor support (from bjwbell:osx-set_cursor); r=jdm
Dependent on https://github.com/tomaka/glutin/pull/300

Source-Repo: https://github.com/servo/servo
Source-Revision: 477f8d22a420e81881ef38b24050275a3a8e0094
2015-03-18 13:24:55 -06:00
Michael Wu c921b145a7 servo: Merge #5257 - Enable PIE so b2s will run on Lollipop (from michaelwu:enable-b2s-pie); r=Manishearth
PIE is required on lollipop. PIE has been supported since jellybean.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4dc5287b4eac2debe3ac5fc69037c8a5dc25c6dc
2015-03-18 12:30:55 -06:00
Ms2ger 66cb126a50 servo: Merge #5256 - Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-de (from servo:rustup_20150311); r=jdm
...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2
2015-03-18 11:25:00 -06:00
Nicholas Nethercote 97460a4cdd servo: Merge #5193 - Add memory reporting infrastructure and use it to measure the display list (from nnethercote:measure-display-list); r=jdm
These changeset implements the beginnings of fine-grained measurement of Servo's data structures.

@pcwalton, @jdm: are you likely reviewers for this?

Source-Repo: https://github.com/servo/servo
Source-Revision: f093620922621e1877393b03968ed0ce767fdf12
2015-03-16 21:33:50 -06:00
Patrick Walton c4615436ae servo: Merge #5160 - layout: Implement ordered lists, CSS counters, and `quotes` per CSS 2.1 § 12.3-12.5 (from pcwalton:counters-redux); r=SimonSapin
Only simple alphabetic and numeric counter styles are supported. (This
is most of them though.)

Although this PR adds a sequential pass to layout, I verified that on
pages that contain a reasonable number of ordered lists (Reddit
`/r/rust`), the time spent in generated content resolution is dwarfed by
the time spent in the parallelizable parts of layout. So I don't expect
this to negatively affect our parallelism expect perhaps in pathological
cases.

Reconstructed from #5138 via raw diffing.

r? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: fd1bb49a65dd998c8ef9890a1576aaf62ddfdba1
2015-03-09 23:24:47 -06:00
Jack Moffitt 3b809426a6 servo: Merge #5170 - Fix scrolling on OS X (from metajack:update-cocoa-glutin); r=pcwalton
This just requires updating glutin and cocoa to pick up some backported fixes.

Source-Repo: https://github.com/servo/servo
Source-Revision: da880af7428e3b76a9a5e7d3a5ff2c80a32d63f0
2015-03-07 20:45:48 -07:00
Gilles Leblanc d4641f1f28 servo: Merge #5105 - Add more robust hostsfile parsing (from gilles-leblanc:issue-5063); r=jdm
Adds hostsfile parsing support for:
* Tabs
* Comments (line and end of line)
* IPv4 address validation
* Basic IPv6 address validation
* End of line whitespaces
* Host name alias (multiple host names per address)

Fixes #5063

Source-Repo: https://github.com/servo/servo
Source-Revision: 1a73766db2442476190f3dcec321f452aa122055
2015-03-05 20:03:55 -07:00
Josh Matthews 6ff0a01710 servo: Merge #5118 - Async document loads (from jdm:pageload); r=Ms2ger
Rebased and improved version of #4967.

Source-Repo: https://github.com/servo/servo
Source-Revision: 72f8898990f06e7f505eeaf9cfa671740c60395d
2015-03-03 16:03:45 -07:00
Simon Sapin 9d0586a22d servo: Revert "layout: Implement ordered lists, CSS counters, and `quotes` per CSS 2.1"
This reverts commit 30fd28d1077fbb3f47140f6ab1252c0d24f44d23.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4c1d778ced267eeef790d4166e361d9348b933d3
2015-03-03 21:16:24 +01:00
Simon Sapin 73082d1626 servo: Merge #5067 - layout: Implement ordered lists, CSS counters, and `quotes` per CSS 2.1 § 12.3-12.5 (from servo:counters); r=SimonSapin
Only simple alphabetic and numeric counter styles are supported. (This
is most of them though.)

Although this PR adds a sequential pass to layout, I verified that on
pages that contain a reasonable number of ordered lists (Reddit
`/r/rust`), the time spent in generated content resolution is dwarfed by
the time spent in the parallelizable parts of layout. So I don't expect
this to negatively affect our parallelism expect perhaps in pathological
cases.

Moved from #4544, because Critic.

Fixes #4544.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5cd6316addc1acf145ed3220719387ef6ef08d2f
2015-03-03 10:42:52 -07:00
Patrick Walton 8d21fbc4f5 servo: Merge #4475 - layout: Implement `text-shadow` per CSS-TEXT-DECORATION-3 § 4 (from pcwalton:text-shadow); r=mbrubeck
r? @mbrubeck

Depends on servo/rust-geom#64.

Source-Repo: https://github.com/servo/servo
Source-Revision: 93d1f40a96df69eb9d38890df96c621e180d78cc
2015-03-02 14:54:52 -07:00
Manish Goregaokar aa848e398d servo: Merge #5033 - Fix gonk warnings, add to tidy (from Manishearth:gonk-warn); r=Ms2ger
Rust still reports that the `*mut ANativeWindow` argument in `gnw_perform` in `gonk/src/window.rs` is ffi unsafe,
however `ANativeWindow` is marked as `#[repr(C)]` and should be okay.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8bc4d07e50aa38371ef383b8f22ec9f7cacaae96
2015-02-28 14:09:48 -07:00
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
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
Glenn Watson 8b295b0ae2 servo: Merge #4419 - Restore glutin close on escape functionality. Also fix linux compile error (from glennw:fix-glutin-esc); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d7b3900431598883212162460254c846bf5f8b52
2014-12-18 01:00:57 -07:00
Patrick Walton cda269baf7 servo: Merge #4358 - compositing: Implement `cursor` per CSS3-UI § 8.1.1 in the CEF/Mac port (from pcwalton:cursor); r=mbrubeck
I'm not sure how we want to handle Linux cursors, and GLFW has no
ability to set cursors (short of disabling it and managing it yourself).

If you test this in the wild you will probably hit #4357 until that PR lands.

Source-Repo: https://github.com/servo/servo
Source-Revision: e2267e0a0749e27046ee8a26ba514cc6865e0345
2014-12-18 00:24:49 -07:00
Glenn Watson 8e111e211a servo: Merge #4414 - Compile fix for glutin feature after rust upgrade (from glennw:fix-glutin); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 592c93e0c252828b8ff2797b7a9fe0e7d59e13af
2014-12-17 20:03:48 -07:00
Glenn Watson b185394a0f servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Glenn Watson bd8a083ff1 servo: Merge #4398 - Update gleam, clear initial framebuffer under glutin (from glennw:glutin-clear); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b8900782b0fcb409f37189bdc08eb7f8b3564a5f
2014-12-16 20:18:44 -07:00
Michael Wu 7c59583691 servo: Merge #4392 - Update Cargo.lock to fix gonk build (from michaelwu:fix-gonk-20141216); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b6a593650bcc33e4188153d135e9a2781a488f96
2014-12-16 13:31:08 -07:00
Glenn Watson a917674ccc servo: Merge #4386 - Update cocoa (needed for newer glutin) (from glennw:update-cocoa); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: cd1ccacf5e803281ead0168c3ac1ba5f64dc9343
2014-12-16 08:24:49 -07:00
Patrick Walton 90a61bb1c7 servo: Merge #4289 - style: Implement basic column spans, quirks mode, and the legacy `bgcolor` and `border` attributes (from pcwalton:hacker-news); r=SimonSapin
This patch provides some of the groundwork for column spans greater than
1. It implements the column-span CSS property as well as the
corresponding colspan attribute; although the former is not
well-specified outside of CSS multi-column layout, INTRINSIC refers to
it. Although width is distributed to spanning columns, they do not yet
contribute minimum and preferred widths; this will be implemented in a
follow-up.

The parsing for the legacy bgcolor and border attributes is
implemented according to the WHATWG HTML specification.

Additionally, this patch cleans up some miscellaneous formatting issues,
refactors layout/css somewhat to eliminate needless levels of
indirection, and cleans up the handling of table rowgroups.

New Hacker News screenshot: http://i.imgur.com/hnl2a7E.png

Source-Repo: https://github.com/servo/servo
Source-Revision: 8e31e5f98747e4b42dafcc4b076fac46aeb09310
2014-12-15 19:33:46 -07:00
Michael Wu b7c00db2cb servo: Merge #4375 - Fix gonk 20141215 (from michaelwu:fix-gonk-20141215); r=glennw
This updates azure to pick up a gonk fix - https://github.com/servo/rust-azure/pull/120 and adds a stub function to the window.

Source-Repo: https://github.com/servo/servo
Source-Revision: d75e85261fd777405482e1a194dff1b5111808d7
2014-12-15 15:06:59 -07:00
Nathan E. Egge 1d5fe80591 servo: Merge #4347 - Sending key events through script task before processing them in the com (from negge:backspace4); r=jdm
...positor.

Fixes #4163

Source-Repo: https://github.com/servo/servo
Source-Revision: 4b8c9128597a7598ef76a4bebe6d81fb2ff9aa1a
2014-12-12 10:36:55 -07:00
Joseph Crail 928a39ceb6 servo: Merge #4171 - Fix spelling mistakes in comments (from jbcrail:fix-spelling); r=jdm
I only updated comments, not strings.

Source-Repo: https://github.com/servo/servo
Source-Revision: f451005f4fe075c849de2f3766f5bf84510b8465
2014-12-12 02:12:51 -07:00
Glenn Watson 3507757306 servo: Merge #4343 - Remove glut port now that android glutin has landed (from glennw:remove-glut); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 9f8dda7abc5f2dc97f5d90aa24fcc5b596ab6918
2014-12-11 19:42:55 -07:00
Glenn Watson 425a65e7fd servo: Merge #4327 - Switch android to glutin (from glennw:glutin-android); r=larsbergstrom,larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 15187cb4512baa57902ac07fe902df14b3c99500
2014-12-11 17:09:54 -07:00
Glenn Watson 1ce2d668d8 servo: Merge #4321 - Update skia + azure to get android compile and text rendering fixes. Sync CEF cargo.lock (from glennw:update-azure-skia-android); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 3d845a0c407182eceb14f122e93a36875823459c
2014-12-10 17:57:51 -07:00
Michael Wu 87f75259e4 servo: Merge #4316 - Make the gonk port work again (from michaelwu:fix-gonk); r=glennw
This makes the gonk port build/work again after the recent CEF port update.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5b53d5a163fb8b32e109d5dea4eddddf64caad08
2014-12-10 13:15:59 -07:00
Glenn Watson ecf4a03a01 servo: Merge #4317 - CEF updates for Linux / MiniServo-GTK (from glennw:linux-cef-fixes); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 13a24fe6c0938084885a1c1305803416a62a2ce7
2014-12-10 12:51:58 -07:00
Patrick Walton 8b6e74fa78 servo: Merge #4193 - ports/cef: Implement accelerated compositing for the CEF port (from pcwalton:cef-redux); r=pcwalton,metajack
@glennw, is it possible to rebase your stuff on top of this? Sorry for the mess.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: ba06d50e3a611d1c27c6c9aa0b21441282911c3f
2014-12-10 09:40:03 -07:00
Michael Wu eba21f3745 servo: Merge #4308 - Remove use of rustuv/green in the gonk port (from michaelwu:remove-libgreen); r=glennw
As requested during the review of the gonk port.

Source-Repo: https://github.com/servo/servo
Source-Revision: 39271aa42d77ac7bbfabb1fd11a975265d645c99
2014-12-09 15:31:12 -07:00
Michael Wu 7e8adc03f1 servo: Merge #4306 - Add a port for gonk (from michaelwu:gonk-port-three); r=glennw
Trying again since critic didn't notice https://github.com/servo/servo/pull/4294 .

Source-Repo: https://github.com/servo/servo
Source-Revision: cbbbf4fbb54ed3fc9c017550df3b6aecc583ba43

--HG--
rename : servo/ports/android/.cargo/config => servo/ports/gonk/.cargo/config
rename : servo/ports/android/glut_app/Cargo.lock => servo/ports/gonk/Cargo.lock
rename : servo/components/servo/lib.rs => servo/ports/gonk/src/lib.rs
2014-12-09 14:42:57 -07:00
Glenn Watson 590ac875aa servo: Merge #4296 - Update rust-openssl to add static linking for android (from glennw:update-openssl); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 2dfc8fed87da0023b4bd5ddac15b3f7a76a97963
2014-12-09 14:09:59 -07:00
Ms2ger 972e593419 servo: Merge #4303 - Update typeable to pick up a warning fix (from Ms2ger:docs-warning); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 25e5d312892421008133cb6c099644cf46a7b2bc
2014-12-09 05:33:57 -07:00
Glenn Watson d6ad689dd4 servo: Merge #4292 - Use mach to build openssl on android instead of glut makefile (from glennw:android-ssl); r=mbrubeck
The glut makefile will be removed shortly after glutin lands
for android, so we need to build openssl for android elsewhere
in the build process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2741fd2e139b9cb8e9f14857877f567ecae3bced

--HG--
rename : servo/ports/android/openssl.sh => servo/support/android/openssl.sh
2014-12-08 17:54:57 -07:00
Tetsuharu OHZEKI d9885c4396 servo: Merge #4279 - Rename "render"/"rendering" to "paint"/"painting" (from saneyuki:rename); r=jdm
#4275

* This changeset rename "render"/"rendering" to "paint"/"painting" under `components/`.
* This does not rename words which are used as general browser's working.
  * So this doesn't change `reftest.rs`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0b486b12109ab765ecee4cbcc684e5d99e8ad5ad

--HG--
rename : servo/components/canvas/canvas_render_task.rs => servo/components/canvas/canvas_paint_task.rs
rename : servo/components/gfx/render_context.rs => servo/components/gfx/paint_context.rs
rename : servo/components/gfx/render_task.rs => servo/components/gfx/paint_task.rs
2014-12-08 10:28:10 -07:00
Glenn Watson c20f134e76 servo: Merge #4207 - Fix path for CEF build (from glennw:fix-cef); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: ccef72385131f923edd63ffc586165aae786adf2
2014-12-07 15:25:07 -07:00
Manish Goregaokar 3984c9b43a servo: Merge #4198 - Hyper+OpenSSL on Android (from Manishearth:hyper-droid); r=Manishearth
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.

Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)

Source-Repo: https://github.com/servo/servo
Source-Revision: 6bd9bf979bcfa96ea14e666b59eab01a6d6c373e
2014-12-05 04:16:11 -07:00
Glenn Watson 7c1de48e14 servo: Merge #4216 - Disable debugging, set wikipedia page for demo (from glennw:android-demo); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b909c2e9345786563ab0b4425b67a8e918549c5
2014-12-03 22:01:11 -07:00
Glenn Watson 32a89127bf servo: Merge #4210 - Update skia submodule to get android build fix (from glennw:skia-android-update); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: ecf98bc6802cd8a2626fb6436be38830ebb9677d
2014-12-03 19:51:57 -07:00
Cameron Zwarich 26e36e8662 servo: Merge #4202 - Remove libgreen support (from zwarich:remove-libgreen); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 92cc423709e96d8eb13b6a59f0ed95e64f3d1822
2014-12-03 18:27:57 -07:00
Patrick Walton e2566c42f2 servo: Merge #4036 - layout: Implement `opacity` per CSS-COLOR § 3.2 (from pcwalton:opacity); r=SimonSapin
This adds the infrastructure necessary to support stacking contexts that
are not containing blocks for absolutely-positioned elements. Our
infrastructure did not support that before. This minor revamp actually
ended up simplifying the logic around display list building and
stacking-relative position computation for absolutely-positioned flows,
which was nice.

This will need this PR: https://github.com/servo/rust-azure/pull/112 I have not updated the Cargo.lock file yet because I want the merge commit.

r? @glennw
f? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 68c90e27970808bddcb8c8a4e782bd4405e67a5c
2014-12-03 15:22:00 -07: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
Patrick Walton 4b99bc08fd servo: Merge #4136 - ports/cef: Replace calls to malloc with calloc (from pcwalton:cef-calloc); r=metajack
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 791606bde79cf38ae8484882a7986a1f258957a4
2014-12-02 14:39:51 -07:00
Patrick Walton 860ec5ac31 servo: Merge #4102 - ports/cef: Use the CEF translator tool to generate the full set of CEF bindings (from pcwalton:cef-autogeneration); r=larsbergstrom
This replaces hand-implemented CEF bindings with proper Rust wrappers
automatically generated from the C++ headers. This means that, whenever
CEF's C++ headers change, we can easily generate both the appropriate C
API and the appropriate Rust API. It eliminates much of the hand-written
unsafe code within the CEF port, because the CEF translator tool now
knows how to generate Rust smart pointer wrappers for each class that
corrently perform reference counting.

Additionally, this commit adds utility macros (located in `macros.rs`)
that make it easier to correctly expose Rust objects as CEF objects.
They handle the marshaling of objects between Rust and CEF properly.
The net result of this is that you can write mostly-natural-looking Rust
in the CEF port and interact with it with a natural-looking C++ API on
the embedding side.

This setup relies on the branch of CEF located here:

    https://github.com/pcwalton/chromium-embedded-framework

To regenerate, follow the instructions in `ports/cef/README.md`. For
convenience, and because I don't anticipate the API to change much, I
have vendored in all of the appropriate interfaces.

r? @zmike or @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 02c2f53ccd8b75ff0b87edfce4f2f9315a6417bd
2014-11-27 23:18:44 -07:00
Simon Sapin 8a29e80eaf servo: Merge #4099 - Add .cargo/config to .gitignore, move content to ports/android (from SimonSapin:cargo-config); r=mbrubeck
This allows using `.cargo/config` at the root of the repository for local path override, without risk of accidentally committing it.

However I don’t have the environment to test the Android build. Would this break it?

Source-Repo: https://github.com/servo/servo
Source-Revision: b5d6864de1000d6d54c2d5ebfd90ea9f6a596c54

--HG--
rename : servo/.cargo/config => servo/ports/android/.cargo/config
2014-11-25 10:01:32 -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
Mike Blumenkrantz a236341106 servo: Merge #4049 - Embedding callbacks (from zmike:embedding-callbacks); r=jdm
begin implementing CEF COM, add more types (stupid rust-bindgen taking forever to figure out...)

@jdm @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 2bba42ad19a792565b653cdd5551933ab2d41c2b
2014-11-21 20:00:36 -07:00
Glenn Watson e76f75ceeb servo: Merge #4051 - Remove unused exit after load option (from glennw:remove-exit-load); r=mbrubeck
This simplifies some upcoming changes to how event handling works.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32d765fb049318f2ff22f39fdeb9fa258ec8a174
2014-11-20 16:54:31 -07:00
Mike Blumenkrantz 0dad71cb40 servo: Merge #4044 - Embedding process (from zmike:embedding-process); r=jdm
Fixes #4023

@SimonSapin @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 133b523d2b3a95796e66e77fe6962abf79c3a4c7
2014-11-20 13:06:32 -07:00
Patrick Walton 9c4a01833c servo: Merge #4040 - cef: Don't link against librustc in the final build artifact (from pcwalton:librustc-linkage); r=metajack
r? @zmike

Source-Repo: https://github.com/servo/servo
Source-Revision: ce6ea55acdf497eacfba8952d74769d164cc6ed8
2014-11-19 13:18:29 -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
Mike Blumenkrantz 2c925704ee servo: Merge #4025 - Embedding string multimap (from zmike:embedding-string_multimap); r=jdm
@jdm @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 71d49a5b8e3d62dde392a85b34b864ad358d4439
2014-11-18 14:39:31 -07:00
Matt Brubeck 9deafa3582 servo: Merge #3987 - Use the correct Rust path in Android packaging (from mbrubeck:rust-root); r=larsbergstrom
r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 2bda68f03862ae9b58673d7685ec80e61d5ba65e
2014-11-17 09:21:28 -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
Mike Blumenkrantz 63ff3af0c3 servo: Merge #3984 - embedding: remove eutil::fptr_is_null, fix #3967, add Option<> to fptrs (from zmike:embedding-option_callbacks); r=jdm
@jdm,  @larsbergstrom

#legday

Source-Repo: https://github.com/servo/servo
Source-Revision: 443b1b98e168f2831ff0d6526c3a00b1a05c763e
2014-11-14 18:45:35 -07:00
Rohan Prinja a25bda56bc servo: Merge #3977 - empty enum replaces c_void (from ajnirp:cef-empty-enums); r=jdm
fix for #3968

Source-Repo: https://github.com/servo/servo
Source-Revision: 0ab70dd539798022ebadd07fb799096809f14d3f
2014-11-14 17:15:33 -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
Mike Blumenkrantz b89d8ffd01 servo: Merge #3947 - Embedding string map (from zmike:embedding-string_map); r=jdm
implements a string map which is 100% identical to CEF

r+ @larsbergstrom  @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 99fc4ab634738136daa993443042a4cbf68c510c
2014-11-13 17:06:30 -07:00
Mike Blumenkrantz 90169aef41 servo: Merge #3946 - Embedding fixups (from zmike:embedding-fixups); r=jdm
adds a missing string api function and renames an existing string_list function

r+ @larsbergstrom @jdm ?

Source-Repo: https://github.com/servo/servo
Source-Revision: 1773198e8d4c5ebe82b4780ebf0828833aa61846
2014-11-13 16:00:40 -07:00
Matt Brubeck 28f2fd7384 servo: Merge #3969 - Update html5ever ref in Android Cargo.lock (from mbrubeck:android-html5-cargo); r=larsbergstrom
Fixes a build error.

Source-Repo: https://github.com/servo/servo
Source-Revision: c713bf472400d79448ba53548884779719bf6459
2014-11-13 11:30:35 -07:00
Josh Matthews 4d3016e023 servo: Merge #3585 - Implement single-line text input (from jdm:input); r=gw
This attempts to implement a bunch of the DOM Level 3 Events spec by implementing the KeyboardEvent interface, the document focus context, and dispatching keyup/keydown/keypress events appropriately. There's also some support for multiline text input that's untested.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2ffa845cf463b14b19322d477a77ffd20efa89a9
2014-11-13 10:57:33 -07:00