Commit Graph

113 Commits

Author SHA1 Message Date
Mike Blumenkrantz
4be5a1ae35 servo: Merge #6175 - Embedding: revenge of cargo (from zmike:embedding-REVENGE_OF_CARGO); r=larsbergstrom
Adds a bunch more embedding interfaces/callbacks/functionality

@larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 94ebfe81e454ca6dd68210b4475b4091e836dd1a
2015-05-27 14:17:32 -05:00
Alexander Putilin
e98e691b67 servo: Merge #6171 - fixes 4184: no-sniff and check-for-apache-bug for mime sniffing (from eleweek:fix-4184-ok); r=Manishearth
I tried fixing #4184 , here is the code I have right now.

I haven't tested it, because I don't know what is the best way to test this part of code. Would like some help with testing this. Should I write an autotest or should I just test manually?

Source-Repo: https://github.com/servo/servo
Source-Revision: be6c251e4c01be61400786e25442f6df36f135f6
2015-05-25 23:10:18 -05:00
Corey Farwell
3d43073796 servo: Merge #6174 - Reduce max line length from 150 to 120 characters (from frewsxcv:cleanup-long-lines); r=SimonSapin
Part of https://github.com/servo/servo/issues/6041

Source-Repo: https://github.com/servo/servo
Source-Revision: 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe
2015-05-24 18:27:26 -05:00
Patrick Walton
5450290fbe servo: Merge #5586 - net: Don't load the placeholder image for background images, only for image fragments (from pcwalton:no-broken-background-image-redux); r=glennw
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 77099b25d590fdaac76721e7f98f4e83672e64a6
2015-05-20 16:43:31 -05:00
Keith Yeung
61c2e05a7c servo: Merge #6129 - Implement fetch (partial #4576) (from KiChjang:fetch-spec); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 79ed6250f0535d62a12b1d7e47e48926d6e3925a
2015-05-19 23:08:41 -05:00
Ms2ger
87f11e1004 servo: Merge #6134 - Cleanup the fetch code (from Ms2ger:fetch); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 40dded8b3a2e9eb9c0f0b7af189df27f3ad6414a
2015-05-19 12:13:37 -05:00
Keith Yeung
f4e4b61f7c servo: Merge #5824 - Implemented http fetch (partial #4576) (from KiChjang:http-fetch-spec); r=jdm
This is a work-in-progress for the implementation of HTTP fetch. Currently, it does not compile, as I haven't figured out how to solve the issues regarding borrows and lifetimes.

Source-Repo: https://github.com/servo/servo
Source-Revision: 90aacf00f866c7ef3b858d84585bd5142f74c9ee
2015-05-18 09:23:43 -05:00
Simon Sapin
c76487e1bf servo: Merge #6021 - Upgrade to Hyper 0.4.0 (from SimonSapin:hyperup); r=Manishearth
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 8cacf20a075b3747509897599c37662721d18d1c
2015-05-12 12:42:49 -05:00
Mike Blumenkrantz
28e2677e9a servo: Merge #5985 - Embedding: wooden bikeshed (from zmike:embedding-woodenbikeshed); r=larsbergstrom
Some small changes.

@larsbergstrom or whoever cares the most at this exact moment.

Source-Repo: https://github.com/servo/servo
Source-Revision: 892a7404266983c6d51218bc18b8aa878d9a7a3e
2015-05-08 15:03:52 -05:00
Adenilson Cavalcanti
65a8501dfc servo: Merge #5987 - This was done already on #5783, maybe was reintroduced by mistake (from Adenilson:rmComment01); r=jdm
Removing outdated comment.

Source-Repo: https://github.com/servo/servo
Source-Revision: a052c53d2e79a0024b62087815eb5d7e4e56d5c9
2015-05-08 13:42:40 -05:00
Simon Sapin
0872ebe9b2 servo: Merge #5968 - Deduplicate some dependencies (from SimonSapin:deduplicate-deps); r=Manishearth
This uses some dependencies from crates.io instead of git where the crates.io copy was already used in some other part of the dependency tree, so we had two copies of the same library.

The `android_glue` crate is the only one left where we have two copies, but solving that is more tricky since we hard-code a path in `components/servo/.cargo/config`.

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 59cb1b03968a55dcce1774088890a3ecf4de0037
2015-05-07 02:31:15 -05:00
Ms2ger
17b04ab97a servo: Merge #5952 - Various cleanup (from Ms2ger:cleanup); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: e779e8905ba530eddf6777dfb7565131cfcd1830
2015-05-05 14:26:37 -05:00
Himaja
b4daf62fd9 servo: Merge #5947 - Extend the developer tools support (from jdm:devtools); r=jdm
Implement HTTP request/response notifications per https://github.com/servo/servo/wiki/More-developer-tools-student-project .

Rebased from #5920.

Source-Repo: https://github.com/servo/servo
Source-Revision: ab589da1f464ed00b0105bc4531690da0118ea5b
2015-05-05 11:52:44 -05:00
Simon Sapin
b72bb5e7d5 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Nicholas Nethercote
afeab10374 servo: Merge #5912 - Add a profile_traits crate to reduce compile times (from nnethercote:profile_traits); r=Manishearth
A rebuild after touching components/profile/mem.rs now takes 48 seconds (and
only rebuilds `profile` and `servo`) which is much lower than it used to be.
In comparison, a rebuild after touching components/profile_traits/mem.rs takes
294 seconds and rebuilds many more crates.

This change also removes some unnecessary crate dependencies in `net` and
`net_traits`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 77f653da2c4120ea7ac1a946d97fc70059d513d4
2015-04-30 20:02:33 -05:00
Glenn Watson
d383783742 servo: Merge #5898 - Handle gzip decompression failure (encountered during jquery test suite work) without panic (from glennw:corrupt-gz); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 738f006afe36a06c8ed4f668904c76ba84e9f1af
2015-04-29 20:03:38 -05:00
Ms2ger
622e167a6a servo: Merge #5888 - Prepare for the rustup (from Ms2ger:prepare-rustup); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: ab2d07db1fabd7ad9590aa7296038bbc91806c3f
2015-04-28 17:52:49 -05:00
Brandon DeRosier
15c52c90f8 servo: Merge #5424 - Add Accept header to HTTP loader (from bdero:bdero/accept-header); r=jdm
The value of the header is: `text/html;q=0.9,*/*;q=0.8`

Closes #5399

Source-Repo: https://github.com/servo/servo
Source-Revision: 21c38d0de8e82e29d187929535a73bfd297538b8
2015-04-26 22:13:30 -05:00
Ms2ger
c7955e722b servo: Merge #5847 - Avoid as_slice() / at_mut_slice() (from Ms2ger:slice); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 1389be37823fccf4108f4e79d0a3a793f0bbe93e
2015-04-26 05:30:28 -05:00
Ms2ger
f3c2bbdd16 servo: Merge #5827 - Use as_slice less (from Ms2ger:slice); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 79be3b967668e46a4289f4fc8fce2b4f457cab23
2015-04-24 12:12:53 -05:00
Mátyás Mustoha
69ad591e1a servo: Merge #5802 - Fix some irregular indentation (from mmatyas:indentfix); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 43d666f94b9b1b8313d430785946b8d3e020fecf
2015-04-22 19:49:30 -05:00
Glenn Watson
1511f427f8 servo: Merge #5767 - Refactored image cache task - details below (from glennw:image-cache); r=larsbergstrom,jdm
* Simpler image cache API for clients to use.
 * Significantly fewer threads.
   * One thread for image cache task (multiplexes commands, decoder threads and async resource requests).
   * 4 threads for decoder worker tasks.
 * Removed ReflowEvent hacks in script and layout tasks.
   * Image elements pass a Trusted<T> to image cache, which is used to dirty nodes via script task. Previous use of Untrusted addresses was unsafe.
   * Image requests such as background-image on layout / paint threads trigger repaint only rather than full reflow.
 * Add reflow batching for when multiple images load quickly.
   * Reduces the number of paints loading wikipedia from ~95 to ~35.
 * Reasonably simple to add proper prefetch support in a follow up PR.
 * Async loaded images always construct Image fragments now, instead of generic.
   * Image fragments support the image not being present.
 * Simpler implementation of synchronous image loading for reftests.
 * Removed image holder.
 * image.onload support.
 * image NaturalWidth and NaturalHeight support.
 * Updated WPT expectations.

Source-Repo: https://github.com/servo/servo
Source-Revision: ac0645c2363b5a6ea3930b0857b3a27f1b6d033f
2015-04-22 19:16:46 -05:00
Adenilson Cavalcanti
cd7344d425 servo: Merge #5783 - Using FF broken image icon (from Adenilson:ffBrokenImage01); r=mbrubeck
Got it from:
https://mxr.mozilla.org/mozilla-central/source/layout/generic/broken-image.png

Source-Repo: https://github.com/servo/servo
Source-Revision: 533949150b7139ddbd22e1df3585fa959d376001
2015-04-21 19:01:38 -05:00
Marcus Klaas
f327dd7955 servo: Merge #5742 - Replace usage of ResponseSenders by LoadConsumer (from marcusklaas:issue-5718); r=jdm
This closes issue https://github.com/servo/servo/issues/5718.

Source-Repo: https://github.com/servo/servo
Source-Revision: f164cc253eb876d82ab7c52268751db250ef8f8f
2015-04-19 10:10:57 -05:00
Josh Matthews
3e5cee10f5 servo: Merge #5156 - Support opt-in async network events (from jdm:asyncnet); r=pcwalton,Manishearth
This implements a framework for opting in to receiving network events asynchronously. It also converts XMLHttpRequest to use them, and paves the way for better support for synchronous XHR using on-demand, targeted event loops instead of spinning the global event loop. This gives us complete feature parity with the existing XHR implementation, using fewer threads than before in the async case.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3151497d498b001b4a783dce0595615c6fc40936
2015-04-16 11:33:06 -05:00
Bogdan Cuza
3e7a81ecf3 servo: Merge #5544 - Make Metadata use ContentType (from boghison:master); r=jdm
Fixes #5538

Source-Repo: https://github.com/servo/servo
Source-Revision: 7f422e2076e7ebc9949e9fb2ffc3f09c653130c0
2015-04-14 15:11:20 -05:00
Corey Farwell
a0f726ff70 servo: Merge #5677 - Update WHATWG links to use HTTPS (from frewsxcv:https); r=Ms2ger
Extracted this out of #5649

This commit was created with the following commands:

```
find . -iname "*.webidl" -type f -print0 | xargs -0 sed -i '' 's/http:\(.*\)whatwg.org/https:\1whatwg.org/g'
```

```
find . -iname "*.rs" -type f -print0 | xargs -0 sed -i '' 's/http:\(.*\)whatwg.org/https:\1whatwg.org/g'
```

Source-Repo: https://github.com/servo/servo
Source-Revision: 4997d3a112354a407365fede1ab1944834a2e13c
2015-04-14 02:57:41 -05:00
Aneesh Agrawal
e995123d66 servo: Merge #5642 - Switch Arc<Box<Image>> to Arc<Image> for perf boost (from aneeshusa:arc-box-image-to-arc-image); r=Ms2ger
Image used to be a trait, but no longer is, so boxing it is no longer
necessary. Fixes #5639.

Source-Repo: https://github.com/servo/servo
Source-Revision: b7f59a36461e6c9eb08b8e48760168d3cb26a400
2015-04-14 01:57:07 -05:00
Edward Cho
c2bdc73673 servo: Merge #5671 - move mime classifier unit tests into unit test crate (from zerokarmaleft:move_mime_classifier_tests); r=SimonSapin
Closes #5667.

Source-Repo: https://github.com/servo/servo
Source-Revision: f67749fc7d9eab13086fbea32b684f3a8eff6688
2015-04-13 16:11:10 -05:00
Jag Talon
79816dbfaa servo: Merge #5576 - net/storage_task.rs: Fix remove_item (from jagtalon:jag/slashdot-storage); r=jdm
Use `and_then` and remove `unwrap` instead of using a `map` as described in https://github.com/servo/servo/issues/5548#issuecomment-90254644.

Fixes #5548

Source-Repo: https://github.com/servo/servo
Source-Revision: 9754c4c255988475d12a9c64a335d9bc8828076b
2015-04-11 18:13:16 -05:00
Ms2ger
bca151fa37 servo: Merge #5631 - Avoid virtual calls when loading files (from Ms2ger:virtual-file); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9677eb292dacd26ea21ab12441b88d538d719814
2015-04-10 08:14:16 -05:00
Aneesh Agrawal
b5257a6f0d servo: Merge #5558 - Remove compositor dependency on net crate (from aneeshusa:remove-compositor-dependency-on-net); r=jdm
Move the ImageCacheTaskClient trait and impl to net_traits. Fixes #5551.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6903955b9835b7cfdff6378e4a547cdad1589443
2015-04-10 07:41:54 -05:00
Mátyás Mustoha
fb6ad71e7f servo: Merge #5595 - Fix int-related warnings in net/mime_classifier (from mmatyas:net_intfix); r=Ms2ger
Also replaced `for` ranges with `a..b` notation.

Source-Repo: https://github.com/servo/servo
Source-Revision: fe5047e55af384cf08bcb00d5cfe8097ae271833
2015-04-08 19:28:28 -05:00
Josh Matthews
92f2b44d8b servo: Merge #5568 - Remove int_uint from net (from jdm:net_uint); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: cad27a9d25390cda965c591f180a46061a2c19e9
2015-04-08 01:47:56 -05:00
Simon Sapin
457ec2ede7 servo: Merge #5574 - Move unit tests to their own crates, cut time by 96% (from servo:unit-tests); r=jack
On my laptop, running `./mach test-unit` goes from about 11 minutes to 22 seconds, when run after `./mach build`.

Fix #5291.

Source-Repo: https://github.com/servo/servo
Source-Revision: 017d1053617f6769d7f355e4a97d52ae67e53d1c
2015-04-07 21:16:49 -05:00
Josh Matthews
ee7d78d6bb servo: Merge #5005 - Implement MIME sniffing (from jdm:mime-sniffing); r=jdm
This rebases and integrates #4209, removing the sniffer task (turns out it wasn't a great idea), and adds a `--sniff-mime-types` command line flag to enable sniffing for file:// and http:// resources. Tested against a random picture file on my harddrive. The actual MIME sniffing implementation can be extracted into a separate library separately.

Source-Repo: https://github.com/servo/servo
Source-Revision: c7e210f24c97be1057a652b3644332e7043bfeac
2015-04-07 12:48:06 -05:00
Manish Goregaokar
2674bab6a8 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
2015-04-03 13:00:46 -06:00
Matt McCoy
80951f486a 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
snf
d4790a06ea servo: Merge #5419 - Send storage event (from snf:send_storage_event); r=jdm
Addresses #5196

Source-Repo: https://github.com/servo/servo
Source-Revision: c0c54875a282fd6d03daba71e6e764763be70e09
2015-03-31 15:51:52 -06:00
Adenilson Cavalcanti
e18e43f938 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
Corey Farwell
2dab12175f servo: Merge #5403 - Improve and fix default_path cookie algorithm (from frewsxcv:cookie-default-path); r=jdm
* Previously, the function returned an owned String, which is not
  necessary, so now it returns a slice
* Steps have now been documented/labeled
* The last step of the algorithm was incorrect; it would only slice the
  path if the "/" was the last character, which is not what the spec
  says. The spec says to slice up until (but not including) the last
  "/". Also added a regression test for this.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d00e37c23dce23cad5b98f82ae711675f324810
2015-03-30 08:52:06 -06:00
Ms2ger
27344015a4 servo: Merge #5388 - Stop using old_io in net tests (from Ms2ger:net-tests); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ac786e29678ceba8c66bcaa0f2096e4cca2a2372
2015-03-26 11:33:55 -06:00
Ms2ger
49789f9058 servo: Merge #5381 - Stop using old_path (from Ms2ger:old_path); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fefdd9afbaa661b1282babc27e3e5ca7c9ea669d
2015-03-26 09:36:56 -06:00
Nicholas Nethercote
511ce78c9b 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
Nicholas Nethercote
dab428b57b 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
2015-03-24 03:15:49 -06:00
Avi Weinstock
5f5564e0e6 servo: Merge #5328 - Fixed some deprecation errors in components/net (from aweinstock314:master); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: be68ea0d81718415cf78e45edbe46800a49697c9
2015-03-23 20:36:47 -06:00
Corey Farwell
28a0660573 servo: Merge #5312 - Cleanup 'view-source:' conditional (from frewsxcv:cleanup-view-source); r=jdm
Fixes #5304

Source-Repo: https://github.com/servo/servo
Source-Revision: 0c3615ced1c4b648e63ad8c33ea0885c45ce3fb1
2015-03-23 15:42:48 -06:00
Ms2ger
0e9f5150d2 servo: Merge #5324 - Remove allow(missing_copy_implementations) attributes (from Ms2ger:missing_copy_implementations); r=jdm
This is now the default.

Source-Repo: https://github.com/servo/servo
Source-Revision: b1a35f549baad871a3691ae485af2efecd2d73f7
2015-03-23 08:45:50 -06:00
Ms2ger
761d1d93b7 servo: Merge #5303 - Update some code that's feature-gated under core (from Ms2ger:core); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 43f3f6c897916aea75773f74060ec84a338834d0
2015-03-21 12:57:46 -06:00
Ms2ger
e3e15283b7 servo: Merge #5297 - Replace most usage of std::old_io::File (from Ms2ger:fs); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: ec60f29203c75b46d59253c7cbb4005fce7e4ad4
2015-03-20 17:00:44 -06:00