Commit graph

14607 commits

Author SHA1 Message Date
bors-servo
951ab565d1 Auto merge of #8867 - nfallen:6638-websocket_loader, r=jdm
Move websocket creation to resource task

This is a pull request for part of https://github.com/servo/servo/issues/6638

It includes the following changes:
-The websocket networking code (ie. making a connection, receiving data, and sending data) has been extracted out of components/script/dom/websocket.rs and into the new file components/net/websocket_loader.rs.
-websocket.rs now communicates with the resource task (components/net/resource_task.rs) to instruct it to initiate a new websocket connection
- websocket_loader.rs now provides an API sent over an IPCChannel that allows websocket.rs to receive feedback about this process and to subsequently send and receive data

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8867)
<!-- Reviewable:end -->
2015-12-08 20:40:50 +05:30
bors-servo
fdef1db395 Auto merge of #8885 - Ms2ger:update-js, r=jdm
Update mozjs.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8885)
<!-- Reviewable:end -->
2015-12-08 13:49:51 +05:30
Nova Fallen
e8c8277f34 move websocket creation to resource task 2015-12-08 02:04:40 -05:00
bors-servo
59029325c0 Auto merge of #8827 - jdm:debugmozjscrash, r=Ms2ger
Avoid a null-dereference using debug mozjs builds. This matches the e…

…quivalent code upstream in Gecko.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8827)
<!-- Reviewable:end -->
2015-12-08 12:11:53 +05:30
Ms2ger
f724493738 Update mozjs and gcc. 2015-12-07 23:59:01 -05:00
bors-servo
cad77d5f1c Auto merge of #8824 - Ms2ger:tidy-lock, r=Wafflespeanut
Rewrite the Cargo.lock tidy check.

Fixes #8691.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8824)
<!-- Reviewable:end -->
2015-12-08 10:21:55 +05:30
bors-servo
9cccd34bc4 Auto merge of #8876 - ecoal95:webgl-nits, r=jdm
WebGL nits

This improves support for running our triangle test (see: https://github.com/servo/servo/pull/8831), and adds missing error in `BufferSubData`

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8876)
<!-- Reviewable:end -->
2015-12-08 03:56:52 +05:30
bors-servo
a4f617bf18 Auto merge of #8873 - apechimp:master, r=Manishearth
Run unit tests in ci

Fixes #8856.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8873)
<!-- Reviewable:end -->
2015-12-08 01:29:18 +05:30
Josh Matthews
30d1ff6abc Avoid a null-dereference using debug mozjs builds. This matches the equivalent code upstream in Gecko. 2015-12-07 14:58:00 -05:00
bors-servo
02f4be9c9f Auto merge of #8862 - fstr:move_workerid, r=Ms2ger
Moved WorkerId type to devtools_traits

Fixes #8846.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8862)
<!-- Reviewable:end -->
2015-12-08 00:53:40 +05:30
Florian Strübe
b81f712ce1 Moved WorkerId type to devtools_traits 2015-12-07 20:11:26 +01:00
bors-servo
7fb5f3c976 Auto merge of #8877 - Ms2ger:update-hbs, r=jdm
Update heartbeats libraries.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8877)
<!-- Reviewable:end -->
2015-12-07 23:07:12 +05:30
Ms2ger
0545ba08af Update heartbeats libraries. 2015-12-07 12:32:11 -05:00
Emilio Cobos Álvarez
a14b605c8e webgl: Add correct error handling to BufferSubData
From the WebGL spec:

> If data is null then an INVALID_VALUE error is generated.
2015-12-07 18:03:36 +01:00
Emilio Cobos Álvarez
89b65f3a02 webgl: Use mediump in triangle test
Support for this should be almost universal.
2015-12-07 18:02:24 +01:00
bors-servo
9f9d3570fc Auto merge of #8874 - Ms2ger:clock-ticks, r=jdm
Move from clock_ticks to time.

This is recommended at <https://github.com/tomaka/clock_ticks>.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8874)
<!-- Reviewable:end -->
2015-12-07 21:38:16 +05:30
Ms2ger
2e40297885 Move from clock_ticks to time.
This is recommended at <https://github.com/tomaka/clock_ticks>.
2015-12-07 11:03:48 -05:00
Mike Atkins
4417b8fd4a Run unit tests in ci
This resolves #8856
2015-12-07 09:43:57 -05:00
bors-servo
f5d05a39af Auto merge of #8866 - frewsxcv:update-packages, r=jdm
Update some Rust dependencies

* [winapi](292ddcdbd2...2d9b5ba0eb)
* [aho-corasick](https://github.com/BurntSushi/aho-corasick/compare/0.3.2...0.4.0)
* [memchr](https://github.com/BurntSushi/rust-memchr/compare/0.1.6...0.1.7)
* [num](4d7cb95740...659c1a73c3)
* [block](https://github.com/SSheldon/rust-block/compare/0.1.1...0.1.4)
* [regex](f07df445db...8ca7815092)
* [cgl](https://github.com/servo/cgl-rs/compare/v0.1.0...v0.1.2)
* [clipboard-win](38f69c2fa0...730f239337)
* [openssl](https://github.com/sfackler/rust-openssl/compare/v0.7.0...v0.7.1)
* [string-cache](https://github.com/servo/string-cache/compare/1bd99f16042ef58d0d06ad0a28e61bf9d4382797...v0.2.2)
* [num_cpus](https://github.com/seanmonstar/num_cpus/compare/b393c1d4a8776b501321d1b4a870983938c7bff0...ac827925a1f3125a7441042ba661ed311c1abe68)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8866)
<!-- Reviewable:end -->
2015-12-07 20:05:21 +05:30
bors-servo
c8daedb1e9 Auto merge of #8861 - salty-horse:wpt_fixes, r=mrobinson
Fix redraw of WPT UI output, and slightly improve line counting

See discussion in PR #8551.

Redraw of the first test name was broken due to a mix-up between two ANSI escape codes.
I also took the opportunity to change the way line count is calculated. It's a bit cleaner that way (the new operation is ~%20 faster, but that's unnoticeable).

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8861)
<!-- Reviewable:end -->
2015-12-07 16:47:28 +05:30
Corey Farwell
1c52aee7a8 Update some Rust dependencies 2015-12-06 22:21:54 -05:00
bors-servo
ef000a458a Auto merge of #8853 - KiChjang:generic-task-sources, r=jdm
Split fn script_chan into 5 different task channel fn

Partial #7959.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8853)
<!-- Reviewable:end -->
2015-12-07 07:46:10 +05:30
bors-servo
95e6b1d101 Auto merge of #8831 - simartin:ticket_6791, r=eefriedman
Issue #6791: Allow more array types in bufferData and bufferSubData.

Fix https://github.com/servo/servo/issues/6791

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8831)
<!-- Reviewable:end -->
2015-12-07 02:39:32 +05:30
Keith Yeung
8d90034d29 Split fn script_chan into 5 different task channel fn 2015-12-06 12:12:14 -08:00
Ori Avtalion
dfac35c77d Improve line counting operation in WPT UI output 2015-12-06 21:24:14 +02:00
Ori Avtalion
359d812ed7 Fix redraw of WPT UI output 2015-12-06 21:05:44 +02:00
bors-servo
e16c930f36 Auto merge of #8855 - romankl:move-focus-enum, r=Ms2ger
move FocusType enum to the script crate

This commit moves the FocusType enum to the script crate and replaces all usages with the new `usage`.

Fixes #8840

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8855)
<!-- Reviewable:end -->
2015-12-06 20:16:23 +05:30
Roman Klauke
bcc53edda4 move FocusType enum to the script crate
This commit moves the FocusType enum to the script crate and replaces
all usages with the new `usage`.

Fixes #8840
2015-12-06 15:39:45 +01:00
Simon Martin
fa555d0e2e Issue #6791: Allow more array types in bufferData and bufferSubData. 2015-12-06 15:28:59 +01:00
bors-servo
7d9a6a8397 Auto merge of #8750 - GuillaumeGomez:master, r=Wafflespeanut
Ensure that tidy follows the same procedure for sorting

Fixes #8734

cc @Wafflespeanut

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8750)
<!-- Reviewable:end -->
2015-12-06 17:23:43 +05:30
Guillaume Gomez
db3457e498 Improve checking algorithms 2015-12-06 03:34:59 +01:00
bors-servo
98972d0434 Auto merge of #8740 - dzbarsky:ispointinpath, r=frewsxcv
Implement IsPointInPath for Canvas

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8740)
<!-- Reviewable:end -->
2015-12-06 07:19:23 +05:30
David Zbarsky
789a90a82f Implement IsPointInPath 2015-12-05 17:49:49 -08:00
bors-servo
2af23dc061 Auto merge of #8852 - servo:visited-issue-link, r=SimonSapin
Add link to issue for :visited

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8852)
<!-- Reviewable:end -->
2015-12-06 02:06:40 +05:30
Simon Sapin
0a8a2c299e Add link to issue for :visited 2015-12-05 21:36:13 +01:00
bors-servo
e774a69440 Auto merge of #8626 - mskrzypkows:build_commands_android, r=larsbergstrom
Draft,  Move OpenSSL Android build to the target directory #8568

I've created a draft, please give me feedback. Is it good direction?

Fixes #8568

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8626)
<!-- Reviewable:end -->
2015-12-05 18:44:32 +05:30
bors-servo
217a55a785 Auto merge of #8812 - jitendra29:support-withCredentials, r=jdm
M1504: Implement basic support for withCredentials API

The pull request includes the following task:

* Implemented basic network-level support by adding a member to LoadData that is used by http_loader.rs to conditionally exclude cookies from the HTTP request if the flag is false (default true)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8812)
<!-- Reviewable:end -->
2015-12-05 05:13:01 +05:30
bors-servo
368dd1dc53 Auto merge of #8829 - jdm:xmlparser2, r=jdm
M1503 : Integrate XML Parser : First 2 of 4 Subsequent Steps

Rebase of #8746. Introduce and use an XML parser for text/xml network responses when loading web pages.
2015-12-05 03:08:40 +05:30
ronak
d38a1a0d03 Create and invoke XML parser for XML documents. 2015-12-04 16:37:13 -05:00
Jigesh Mehta
ce3c9ff57c implement support for withCredentials 2015-12-04 16:34:30 -05:00
Josh Matthews
9d3b915cac Introduce abstraction over HTML and XML parsers for parser network listener. 2015-12-04 16:32:54 -05:00
jsharda
a840a23990 Prepare infrastructure for XML parser. 2015-12-04 16:32:53 -05:00
Ms2ger
b72c8e5e18 Rewrite the Cargo.lock tidy check. 2015-12-04 17:55:48 +01:00
bors-servo
2cfcc26d9e Auto merge of #8788 - ecoal95:fix-webgl-texturing, r=jdm
webgl: Fix texturing

These two tiny changes were making WebGL textures not work.

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

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8788)
<!-- Reviewable:end -->
2015-12-04 22:12:26 +05:30
bors-servo
b32128e299 Auto merge of #8768 - vegayours:8616_intermittent_option_unwrap_in_timers, r=jdm
fix intermittent Option::unwrap in timers

fixes intermittent #8616

This intermittent indicates real problem in code.
Lets consider such code:
```javascript
// timer 1
setTimeout(function() {
     //timer 2
     setTimeout(function() {}, 0);
}, 0);
```
When we receive event to fire timer 1 it will be selected and extracted from active timers list in fire_timer function. During timer 1 handler execution we will schedule timer 2 and request timer event for it. But it will be executed during same fire_timer call because of 0 timeout. And as a result we will have empty timers list and expecting event for timer 2 that will crash in assert.

I'm not sure that all I've written is clear, but we have something like this:
```
install timer 1 -> [1] in timers list
push and expect timer event 1 -> expected_event=1
received timer event 1
    fire_timer()
         select timer 1 to execute -> [] in timers list
         execute timer 1 handler
             install timer 2 -> [2] in timers list
             push and expect timer event 2 -> expected_event=2
         select timer 2 to execute (because of 0 timeout) -> [] in tiemrs list
         execute timer 2 handler
expected_event=2 is dangling
received timer event 2
    fire_timer() -> BOOM
```

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8768)
<!-- Reviewable:end -->
2015-12-04 21:19:58 +05:30
Aleksandr Likhanov
d891e75d9d fix intermittent Option::unwrap in timers
not allow to fire timers installed during another timer call
2015-12-04 20:16:43 +05:00
bors-servo
9c26903472 Auto merge of #8805 - Ms2ger:drain_modified_elements, r=jdm
Simplify drain_modified_elements a bit.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8805)
<!-- Reviewable:end -->
2015-12-04 20:22:54 +05:30
Emilio Cobos Álvarez
f3bd1f7879 webgl: Ensure we don't generate gl errors in the paint task
The validations performed in the script side of this should always
prevent this from happening, and this will allow us to catch bugs like
the previous one.
2015-12-04 10:58:26 +01:00
bors-servo
bb117abcd3 Auto merge of #8820 - Ms2ger:warnings, r=SimonSapin
Fix warnings.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8820)
<!-- Reviewable:end -->
2015-12-04 15:09:00 +05:30
Ms2ger
208c05f944 Fix warnings. 2015-12-04 10:31:19 +01:00