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

4177 Коммитов

Автор SHA1 Сообщение Дата
Ms2ger 81faabdc8e servo: Merge #6437 - Implement AttrHelpersForLayout for LayoutJS<Attr> rather than Attr itself (from Ms2ger:AttrHelpersForLayout); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: bf64e2765aeb88611e781abeae4360f69a3a6caa
2015-06-21 08:31:04 -06:00
Ms2ger 1e7e3efa45 servo: Merge #6417 - Require documentation for the memory profiling module (from servo:profile-docs); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: b8c7f49ce8a130a057eea4cfc912bd68c99687aa
2015-06-21 03:54:21 -06:00
Ms2ger e104b4dc8b servo: Merge #6435 - Various CEF refactoring (from Ms2ger:cef); r=zmike
Source-Repo: https://github.com/servo/servo
Source-Revision: 6e04c12bceb04ab3bbf69f83664e9a7e546ea732
2015-06-20 11:17:49 -06:00
Mátyás Mustoha e7a0989a0c servo: Merge #6421 - Fix ARM linker (from mmatyas:arm_build2); r=larsbergstrom
By default, `cc` is used for the final linking of servo, which points to the host's compiler. This patch ensures that the correct linker is used for cross-compiling to ARM.

Part of #6327

Source-Repo: https://github.com/servo/servo
Source-Revision: fa45688191221bf32a7a20188d5a8817c4ab61f2
2015-06-20 09:00:55 -06:00
Hyowon Kim afce9d1b30 servo: Merge #6413 - Check invalid values for the shadow attributes (from hyowon:invalid_shadow_attrs); r=Ms2ger
I left out checking invalid values when setting the shadows attributes.
r? @nox @pcwalton
cc @yichoi

Source-Repo: https://github.com/servo/servo
Source-Revision: 02303941bef5f5bbdbec750ab0dfa0b77f32345a
2015-06-20 06:44:08 -06:00
Michael Wu 6a46bbff4b servo: Merge #6433 - Fix some warnings caused by the SM upgrade (from michaelwu:fix-smup-warnings); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 72ead882c08fbd66d59457efd1ebf86ee4ee97f2
2015-06-19 20:56:29 -06:00
Emilio Cobos Álvarez 81d4cbeaf1 servo: Merge #6429 - Update jQuery tests usage message (from emilio:patch-1); r=metajack
It was in the wrong order.

Source-Repo: https://github.com/servo/servo
Source-Revision: de251795c350a4f1ddb4afc78389906491e50e03
2015-06-19 19:31:57 -06:00
Michael Wu 7512d04e93 servo: Merge #6150 - Upgrade to Spidermonkey 39 (from servo:smupgrade3); r=mbrubeck
> Here it is.
>
> ~~There's two major things that are unfinished here:~~
> - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done.
> - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done.
>
> I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location.
>
> Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later.
>
> Generational GC works. SM doesn't work without it.
>
> The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`.
>
> Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it.
>
> `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`.
>
> `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case.
>
> This has been tested with the following zeal settings:
>
> GC after every allocation
> JS_GC_ZEAL=2,1
>
> GC after every 100 allocations (important for catching use-after-free bugs)
> JS_GC_ZEAL=2,100
>
> Verify pre barriers
> JS_GC_ZEAL=4,1
>
> Verify post barriers
> JS_GC_ZEAL=11,1

Source-Repo: https://github.com/servo/servo
Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
2015-06-19 16:46:55 -06:00
Glenn Watson 00cf610c8f servo: Merge #6424 - Update gleam to 0.1.1 (from glennw:update-gleam); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: a256f39796270cd3a5f40f33eaa4e407117b0cc6
2015-06-18 21:57:55 -06:00
ecoal95 b32a9cd993 servo: Merge #6423 - Use euclid from crates.io (from emilio:euclid); r=glennw
Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 4ebb95ccd8e034007eacb447a054919ef4af2bf7
2015-06-18 20:50:22 -06:00
Jack Moffitt bdf71e84d8 servo: Merge #6412 - Remove duplicate package (from metajack:cleanup-dupe-gleam); r=glennw
Source-Repo: https://github.com/servo/servo
Source-Revision: 7355bf1061a21114654c1e8abe1d752624200799
2015-06-17 21:56:38 -06:00
Jack Moffitt 5d2788ae32 servo: Merge #6411 - Don't generate pyc files (from metajack:fix-script-out-dir); r=glennw
This eliminates the last bit of script crate generating in-tree
files. This now allows cargo target dir sharing to fully work.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5dc546b4cf19b3281ee10d2948a75984c62e3763
2015-06-17 21:18:42 -06:00
Glenn Watson e97872727c servo: Merge #6403 - Fix computed value of outline width when outline style is not set (from glennw:fix-outline-width); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: fd44db2190ac4f2d8b71d048600b22554ab86f2e
2015-06-17 20:29:44 -06:00
Jack Moffitt 85fd686b68 servo: Merge #6408 - Generate code into OUT_DIR (from metajack:script-outdir); r=SimonSapin
This is necessary to ensure Cargo knows when to rebuild. Normally
.gitignore would be enough to exclude these from Cargo's freshness
calculation, but https://github.com/rust-lang/cargo/issues/1729 prevents
this currently. This is the new, correct way to do these thigns, just
like the style crate does.

Source-Repo: https://github.com/servo/servo
Source-Revision: ff59e1b8de67f1988522d6b6e6c4adda957fad5b
2015-06-17 16:36:05 -06:00
Hyowon Kim 8d982b374e servo: Merge #6402 - Fill and stroke for all pattern types and check the zero size gradient (from hyowon:canvas_fill_stroke); r=pcwalton
Depends on servo/rust-azure#170 which has been already merged.
So this patch contains the update of rust-azure.
r? @nox
cc @yichoi

Source-Repo: https://github.com/servo/servo
Source-Revision: e1b28d893e54601bf497d0d5b83d77658ca16bac
2015-06-17 13:32:25 -06:00
James Graham 24c23bd95c servo: Merge #6401 - Implement timeout for url load from WebDriver (from jgraham:load_timeout); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: ee54c89e3f801dcd90a494c65ff8cfd975a6be6f
2015-06-17 10:16:27 -06:00
Hyowon Kim d09678524e servo: Merge #6355 - Implement drawing shadows in canvas (from hyowon:drawing_shadows); r=nox
https://html.spec.whatwg.org/multipage/#when-shadows-are-drawn
r? @nox
cc @mmatyas @yichoi

Source-Repo: https://github.com/servo/servo
Source-Revision: 48e1d45bffaf7679d1f9487038a104f373a90e5a
2015-06-16 05:30:20 -06:00
Jinwoo Song 787247886d servo: Merge #6397 - WebSocket constructor should not panic (from servo:ws-connect); r=Ms2ger
Make an early return when the WebSocket connection fails in the constructor.
Also let the WebSocket connection to be closed when the connection could
not be established.

Fixes #6082.

Source-Repo: https://github.com/servo/servo
Source-Revision: a5d76e4b2c6ae8e2db82fc5156ad1bebf7961f80
2015-06-16 01:47:10 -06:00
Simon Sapin 1fe2355ac7 servo: Merge #6396 - Use html5ever and string-cache from crates.io (from SimonSapin:crates.io-html5ever); r=Ms2ger
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 4435e6f42a1b57a3e6a0cfbb1033525fef5db174
2015-06-16 00:42:36 -06:00
Simon Sapin 9f3f7f698e servo: Merge #6395 - Use cgl and gleam from crates.io (from SimonSapin:crates.io-cgl-gleam); r=metajack
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 5d89235c5696a65bcf93a5da5244093294eb4fbe
2015-06-15 15:08:43 -06:00
Jack Moffitt a44285c32d servo: Merge #6306 - Use Cargo's target directory sharing (from metajack:shared-target-dir); r=mbrubeck
This speeds up `./mach build --dev` followed by `./mach build-cef` by
25%. When rust-lang/cargo#497 is fixed, this speedup will increase
dramatically.

Source-Repo: https://github.com/servo/servo
Source-Revision: d6263c9b6e969fde4c644034e684a39d68667ad9
2015-06-15 13:08:14 -06:00
Ms2ger 0899326ec7 servo: Merge #6393 - Improve the cef string multimap (from Ms2ger:cef-string-multimap); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: bb39e835f16cf53a8135f873ed6e979640c0a8ba
2015-06-15 12:25:11 -06:00
Manish Goregaokar b6e7083252 servo: Merge #6377 - Upgrade to rustc 1.2.0-nightly (6e7fcc44a 2015-06-13) (from servo:rustup_20140614); r=SimonSapin
See #6376

r? @Ms2ger

Snaps don't exist yet, putting up the @larsbergstrom signal. The snap need not exactly match this commit, anything in the vicinity, or just master, should work really. (yay stability)


There's no particular reason behind this rustup except that I want to keep Servo running on almost-master as much as possible.

Source-Repo: https://github.com/servo/servo
Source-Revision: 67b121c0b82f4a2107d7b015f60bd025e04dc336
2015-06-15 10:33:14 -06:00
Simon Sapin ab51eb3db1 servo: Merge #6388 - Remove usage of String::from_str, deprecated in #6377 (from SimonSapin:from_str); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 91cae119311064cab7f20ff898c1d885054907b5
2015-06-15 09:23:22 -06:00
Ms2ger 758ff53bd9 servo: Merge #6378 - TreeWalker-acceptNode-filter.html fixes (from Ms2ger:callable); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 24af4c4ec638b0484c8acacdf7cb9acb87da24ff
2015-06-14 12:17:21 -06:00
Ms2ger 3ba4358a8a servo: Merge #6325 - Use str::parse() rather than FromStr::from_str (from Ms2ger:from_str); r=nox
The former appears to be preferred.

Source-Repo: https://github.com/servo/servo
Source-Revision: db2eb36e19581eee83247160bbb03e2a671d0479
2015-06-14 03:55:56 -06:00
Francesc Bautista 9516135f35 servo: Merge #6360 - Fix #6315 Set default render mode on tests to cpu (from fbau123:6315-tests-default-cpu-mode); r=Ms2ger
#6315

Set 'mach test-ref' default render mode to cpu and added a cli argument to 'mach test' to be able to select the render-mode, also renamed the 'kind' argument from 'test-ref' to '--render-mode' for coherence with reftest.rs

Source-Repo: https://github.com/servo/servo
Source-Revision: bedfa74b1f66a87dac00c46ac6560fa012f033d9
2015-06-14 03:14:00 -06:00
ecoal95 126dc71f5c servo: Merge #6357 - Add missing WebGL interfaces, and a few gl calls (from emilio:more-webgl); r=pcwalton
See the commit descriptions for more details.

Blocked on https://github.com/servo/gleam/pull/24

Source-Repo: https://github.com/servo/servo
Source-Revision: ceaca2e2885be89d47553090a45cf9048812e3b4
2015-06-13 15:05:08 -06:00
Corey Farwell 711c6ca962 servo: Merge #6349 - rust-geom API changes (from frewsxcv:geom-api-changes); r=pcwalton
Shouldn't be merged until these have merged:

https://github.com/servo/rust-geom/pull/81

https://github.com/ecoal95/rust-offscreen-rendering-context/pull/13

https://github.com/servo/rust-layers/pull/178

~~I'll also need to update the Cargo lock files once they merge~~

Source-Repo: https://github.com/servo/servo
Source-Revision: cfcd8589d06935f83b903f76477ea03e4d4652d0
2015-06-13 13:52:07 -06:00
Ms2ger ef47ae4530 servo: Merge #6370 - Update the Cargo.locks (from Ms2ger:locks); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: a9aa50683fec9ade7969e1ed29a9bc21d798f97e
2015-06-13 10:49:00 -06:00
ecoal95 11343d804e servo: Merge #6356 - Add WebGL android support (from emilio:webgl-android); r=jdm
This just bumps `offscreen_gl_context`, which added egl support
recently.

Source-Repo: https://github.com/servo/servo
Source-Revision: b0a80de92bf946696fdc9c227439796b094bfde7
2015-06-13 02:31:33 -06:00
Hyowon Kim 97b64f7e8d servo: Merge #6157 - Implement pattern fill style for canvas (from hyowon:canvas_pattern_fill); r=nox
Issue #6056
Depends on servo/rust-azure#160

Source-Repo: https://github.com/servo/servo
Source-Revision: 9474e62d38f61f2b3a385ca32d64cab975b014ce
2015-06-13 01:49:50 -06:00
Sumith 87cbc76930 servo: Merge #6362 - Entries in servobuild.example file (from Sumith1896:servobuildexample); r=Manishearth
Entries in the servobuild.example file that are not defaults were
commented out, defaults were mentioned in comments.
Fix to https://github.com/servo/servo/issues/6361

Source-Repo: https://github.com/servo/servo
Source-Revision: 3c1b8041d496746189c03dcd0f6e2af1ebca56b0
2015-06-12 23:39:01 -06:00
Patrick Walton d2ff8bc1ff servo: Merge #6308 - script: Make `PartialEq` on element type IDs generate a lot less code (from pcwalton:debloat-partialeq); r=nox
This makes the difference between selector matching scaling on the ARM
Cortex-A9 and not, because the auto-derived `PartialEq` implementation
blows out the 32KB I-cache. With this change, there is a 2x improvement
in selector matching over sequential when using all 8 cores. (More work
needs to be done; this is a start.)

r? any DOM expert

Source-Repo: https://github.com/servo/servo
Source-Revision: c3d242544e809aca945cf0ca6c2bf0f45ce6a602
2015-06-12 21:04:05 -06:00
Eduard Burtescu 3c5a945f75 servo: Merge #6302 - Preserve UserAgent header on redirect (from eddyb:preserve-ua-on-redirect); r=nox
This unblocks facebook.com's feed, after a few months of it being accidentally broken.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8063e342359615552b26ea10d42b2c6a827331fb
2015-06-12 19:51:26 -06:00
Nicholas Nethercote 514fcbb039 servo: Merge #6334 - Measure LocalLayoutContexts in LayoutTask and LayoutWorkers (from nnethercote:report-local-contexts); r=pcwalton
Passing a function that measures TLS to WorkQueue is a bit weird, but I can't see how else to measure that data.

Source-Repo: https://github.com/servo/servo
Source-Revision: f03f584895f80deb08c77c817f6655609c4ee97c
2015-06-12 18:42:32 -06:00
Patrick Walton 3dca4cd0c1 servo: Merge #6347 - layout: Divide DOM nodes and flows into chunks, and perform work stealing over those instead of working on nodes one-by-one (from pcwalton:chunking); r=mbrubeck
This reduces the overhead of the work-stealing traversal function
significantly. It's especially important on ARM, where memory barriers are
expensive.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: 836ac8a0b6daeecb865bcf35d2b39602398870ef
2015-06-12 17:14:23 -06:00
Avi Weinstock 23f0359eb3 servo: Merge #6340 - Remove some unnecessary allocations in text input handling (from aweinstock314:reduce-textinput-allocations); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 2168ec3c96ca9e8e1174be22be07d1168061b4b6
2015-06-12 15:00:37 -06:00
Mátyás Mustoha a48503b881 servo: Merge #6354 - Remove gfx_traits from the dependencies of [script] (from mmatyas:canvas_remdep); r=Ms2ger
It seems @hyowon uploaded her canvas shadow patch faster than me; I've handled the color dependency a bit different, this way `gfx_traits` is not required by the script module.

Source-Repo: https://github.com/servo/servo
Source-Revision: c8c7bd900dde73d4fddafea8239f44440f1c863b
2015-06-12 10:22:54 -06:00
Patrick Walton a5ebfdb55e servo: Merge #6345 - util: Reduce memory barriers and integer divisions in the work queue (from pcwalton:workqueue-arm-optzns); r=glennw
Improves scaling on multicore ARM devices.

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 9ea50957fcf502e48acaa074e08872a73df9ac23
2015-06-12 07:28:19 -06:00
Anthony Ramine ae3def062a servo: Merge #6348 - Update azure to b9bb83c733507f3f57e2c334499f38432056e26c (from nox:azure); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b318d53e223707fa2da16c5ad38f04ce7cf52de
2015-06-12 05:49:32 -06:00
Nicholas Nethercote 8ef165e5c2 servo: Merge #6346 - Improve unit testing of util::mem (from nnethercote:improve-mem-unit-testing); r=Manishearth
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: b9d53a2950e41ec9291d3d4fe5efa7eeb57a5253
2015-06-12 04:08:53 -06:00
Hyowon Kim a540721b23 servo: Merge #6337 - Add attributes for canvas shadows (from hyowon:shadow_attrs); r=nox
The first step of the implementation for shadows in canvas.
r? @nox @jdm
cc @yichoi

Source-Repo: https://github.com/servo/servo
Source-Revision: f163f2bf0d32861ea20470d405bb517ed5b09e84
2015-06-12 03:27:07 -06:00
Ms2ger 3e4e83073b servo: Merge #6353 - Revert "WebSocket constructor should not panic" (from servo:revert); r=Ms2ger
This reverts commit 877c369e0bc5db4286457be36d015eeb1f0ae2f2.

Source-Repo: https://github.com/servo/servo
Source-Revision: 85d839fb5c6ff023897828b0873caa8972842969
2015-06-12 02:44:37 -06:00
Jinwoo Song fb5908901f servo: Merge #6338 - WebSocket constructor should not panic (from servo:ws-connect); r=Ms2ger
Make an early return when the WebSocket connection fails in the constructor.
Also let the WebSockect connection to be closed when the connection could
not be established.

Fixes #6082.
Fixes #6086.

Source-Repo: https://github.com/servo/servo
Source-Revision: a3eb253bdce7ed4ad5bcc2c2e7af9cfe01826d99
2015-06-11 05:58:56 -06:00
Nicholas Nethercote 446d20512c servo: Merge #6335 - Ignore CollectReport messages when shutting down the LayoutTask (from nnethercote:fix-layout-task-shutdown-panic); r=metajack
Prior to this change, a panic would occur if a CollectReport message was
received while the LayoutTask was shutting down. Now it just gets
ignored.

Source-Repo: https://github.com/servo/servo
Source-Revision: 74ef31cfc4805d6dbeaa9e4769f0ceb14d124733
2015-06-11 00:58:41 -06:00
Brandon Fairchild 2c8e608418 servo: Merge #6336 - Appease Github's Linguist (from nerith:master); r=Manishearth
According to #6332, Github's Linguist reported Servo as being
written in HTML instead of Rust. This fixes that by overriding
the linguist-vendored attribute for the tests directory.

Source-Repo: https://github.com/servo/servo
Source-Revision: 37fcced0fa6b23a43596333aa9f057b21d0e6157
2015-06-10 22:30:58 -06:00
Matt Brubeck 2a94995bac servo: Merge #6328 - Fix indices in Line::range doc comment (from mbrubeck:line-comment); r=pcwalton
r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: a8b6632a5ade7b1f6fff243abb9223daf260284b
2015-06-10 17:44:55 -06:00
Nicholas Nethercote 679452a543 servo: Merge #6309 - Instrument FreeType allocations (from nnethercote:instrument-freetype); r=glennw
This will allow reporting of memory usage by FreeType instances, which
are measured in the MiBs for LayoutWorker threads.

This change also makes FreeType allocations happen with jemalloc instead
of the system malloc, which is a good thing.

Finally, the change documents some dubiousness involving
FontContextHandle.

Source-Repo: https://github.com/servo/servo
Source-Revision: fdeebf86a1424e9fffa122efa08fe397f6e7cd7d
2015-06-10 16:53:55 -06:00
Glenn Watson 172144e575 servo: Merge #6331 - Updates for changes in rust-geom and rust-layers (from glennw:remove-generic-again); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 752e03a502413f21cfb30e55d68110c50e034da6
2015-06-10 16:05:20 -06:00