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

609 Коммитов

Автор SHA1 Сообщение Дата
Simon Sapin b2ea85ccbd servo: Merge #8800 - Fix warnings (from servo:warnings); r=metajack
Fixing unused attributes warnings required updating serde_macros
which required updating to rustc 1.6.0-nightly (a2866e387 2015-11-30)
which required updating some other dependencies.

Fix #8709.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32b90cdb6ff8f24dfd93aa44c2bae9c4f15429e0
2015-12-04 05:08:38 +05:01
Matt Brubeck 90c5caf1aa servo: Merge #8785 - Add slow path for hit testing of iframe behind positioned content layer (from mbrubeck:fixed-hit-test); r=pcwalton
Fixes browser.html blocker #8759. r? @pcwalton

This adds a slow path for cases where the compositor's layer-based hit testing is incorrect.  If the script task discovers that a mouse event should have been dispatched to an iframe, it bounces the event back to the constellation to be forwarded to the correct pipeline.

This isn't terribly slow (on the slow path, it adds one extra round-trip message between script and constellation), but if we want to optimize this better we could instead replace the compositor's layer hit testing with display list hit testing in the paint task.  This would be a more complicated change that I think we should save for a follow-up.

This only fixes mouse input for now.  A basically-identical change will be needed for touch-screen input, whether we stick with this approach or switch to the paint task.

Source-Repo: https://github.com/servo/servo
Source-Revision: bc62b5aadb62267582fbd65daa28438ce6c6ac9c
2015-12-04 02:25:22 +05:01
Jason Williams 3c61eb8298 servo: Merge #8787 - now using external ref_slice instead of the std version fixed #8695 (from Jayflux:hotfix/8695); r=mbrubeck
Fixes #8695.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8ae008761f6bf19b7c912cf9e0bf2aa157f32dec
2015-12-03 15:41:24 +05:01
Simon Sapin d4a1557a4b servo: Merge #8757 - Use skia and deps from crates.io (from servo:skia); r=mbrubeck
This makes the initial download for skia go from a 300 MB git repository to a 5 MB tarball. This should help with issues like #6132 and #7687.

Fix https://github.com/servo/skia/issues/70

This builds, but the at the moment causes a number of tidy errors for duplicated crates.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8b95d7b8d860ec4c0834192083361a9fb78ddbeb
2015-12-03 12:29:29 +05:01
Glenn Watson 127620000d servo: Merge #8755 - Add debug option to disable vsync for profiling (from glennw:vsync); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: b4906aa008325963348b6cc13bbcf8d2a4c9d694
2015-12-01 04:57:00 +05:01
James Sanders 7f2bc7ba3c servo: Merge #8705 - Use thread::sleep instead of deprecated sleep_ms (from jsanders:fix-sleep-ms-deprecations); r=metajack,Wafflespeanut
Similarly, change one instance of `thread::park_timeout_ms`.

Fixes #8694

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f7204936394fe104431f01c68ffa17829426cba
2015-11-30 08:51:15 +05:01
Eli Friedman ab5455716f servo: Merge #8703 - Compute attribute name atoms at compile-time (from eefriedman:dom-getter-setter-atom); r=frewsxcv
Source-Repo: https://github.com/servo/servo
Source-Revision: eadaf30af396857535ad15b269bcba4f58e1ff9a
2015-11-28 20:11:07 +05:01
Guillaume Gomez 732bf0a03c servo: Merge #8692 - Ensure crate are alphabetically sorted (from GuillaumeGomez:patch-1); r=Wafflespeanut
cc @nox

Source-Repo: https://github.com/servo/servo
Source-Revision: dbff1ab33636bc7d60a4c97b63f39b59985726ce
2015-11-28 19:05:11 +05:01
Simon Sapin 53a59ae9e9 servo: Merge #8698 - Upgrade to rustc 1.6.0-nightly (1805bba39 2015-11-26) (from servo:rustup_2015-11-26); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: b4213e6d8e2ab0dc03b5af9f9b1b2589b0e598a6
2015-11-28 11:42:52 +05:01
Brandon Fairchild 8d63b807b3 servo: Merge #8701 - Remove `#[allow(raw_pointer_derive)]` attributes (from nerith:attribute); r=jdm
The attributes are unused.

Fixes #8699.

Source-Repo: https://github.com/servo/servo
Source-Revision: c0be03f2afbd7aa02620325cd25256c97c75e559
2015-11-28 05:38:46 +05:01
Manish Goregaokar 693578b06a servo: Merge #8446 - Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08) (from servo:rustup_20151110); r=SimonSapin+Ms2ger+jdm+Manishearth
<s>DO NOT r+ or try+ this</s>

<s>It causes an OOM (https://github.com/rust-lang/rust/issues/29740) and can crash the OS. Probably will set our CI on fire. </s>

Source-Repo: https://github.com/servo/servo
Source-Revision: f13c72d68e1e7f49e241938bfd6e8a588c68e86b
2015-11-27 10:18:00 +05:01
Josh Matthews f5c0383b1b servo: Merge #8689 - Remove remaining version-conflict exceptions in tidy.py (from jdm:deps); r=frewsxcv
Source-Repo: https://github.com/servo/servo
Source-Revision: bc618b0d535e0e67a7ea845c026678113f000d64
2015-11-27 08:48:54 +05:01
GauriGNaik 5b0ca679ad servo: Merge #8682 - Defined new trait ParseErrorReporter and added error_reporter member … (from jdm:css-error-reporter); r=jdm
…to ParserContext.

Rebase of #8210.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5ef2f4f75cd58a3c6f1f123e413dc9d3a24f841
2015-11-27 03:27:08 +05:01
Alan Jeffrey f4ab2bfdb5 servo: Merge #8667 - Update string cache (from asajeffrey:update-string-cache); r=SimonSapin
Updated string_cache to 0.2, and updated the dependencies that depend on string_cache.
Removed references to string_cache_plugin.
Import atom! and ns! from string_cache.
Replaced ns!("") by ns!().
Replaced ns!(XML) and co by ns!(xml) and co.
Replaced Atom::from_slice by Atom::from.
Replaced atom.as_slice() by &*atom.

r? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: 188fa9378c103093f1f8dac24bff0d9d237fd2bc
2015-11-25 23:41:39 +05:01
Patrick Walton a2c55b5db1 servo: Merge #8660 - Update `ipc-channel` to pick up the improved error reporting (from pcwalton:ipc-channel-errors); r=larsbergstrom
Intended to help diagnose intermittent failures.

r? @jdm or @larsbergstrom (or whoever)

Source-Repo: https://github.com/servo/servo
Source-Revision: 13a96fcaf78c299beb2021d3ae9dae8d9e916762
2015-11-25 07:02:15 +05:01
Simon Sapin e11fa44aa2 servo: Merge #8653 - Remove dependency on regex_macros (from servo:no-regex-macros); r=Ms2ger
This reduces the amount of code using unstable features that we depend on.
The hand-written IP address parser is probably just as fast.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6f35b867c9c3bb7a345e2ac34e5970b93a1d3ea1
2015-11-25 02:36:10 +05:01
Keith Yeung b6f924158d servo: Merge #8609 - Add content_type to metadata in file_loader (from KiChjang:file-loader-headers); r=KiChjang
Fixes #4212.

Source-Repo: https://github.com/servo/servo
Source-Revision: ed6a3f5022ebfa364595b91d68b73e6ff60a4954
2015-11-25 01:20:26 +05:01
Corey Farwell 142c7b7efe servo: Merge #8622 - Implement 'url!(..)' macro (from frewsxcv:url-plugin); r=SimonSapin
https://github.com/servo/rust-url/issues/136

https://github.com/servo/rust-url/pull/137

Source-Repo: https://github.com/servo/servo
Source-Revision: ea690a2dff64d1cb4eb668473d62f1bbcb19f7c8
2015-11-21 20:41:52 +05:01
Patrick Walton 8c7de61738 servo: Merge #8599 - compositing: Split Servo up into multiple sandboxed processes (from jdm:e10s-redux); r=metajack
Multiprocess mode is enabled with the `-M` switch, and sandboxing is
enabled with the `-S` switch.

Rebase of #6884.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8b39b9afed6ef8a3d7d3e6609fd301a37825d3e1
2015-11-20 03:30:48 +05:01
Aleksandr Likhanov a4e688b2a0 servo: Merge #8589 - Reduce node.unique_id size (from vegayours:8360_reduce_node_unique_id_size); r=eefriedman
Source-Repo: https://github.com/servo/servo
Source-Revision: e5c9b4859870ab7dcb6a5137ac5106088ccc3872
2015-11-20 01:15:19 +05:01
Ms2ger 039acf7bfe servo: Merge #8562 - Stop exposing the internal details of the layout crate (from Ms2ger:private-layout); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 2be0cb7827c6553b7dfa4d641bf3a1c72372ad3b
2015-11-18 19:04:36 +05:01
Roman Klauke 294367db3f servo: Merge #8527 - Replace Atom::from_slice("sizes") with atom!("sizes") (from romankl:atom-slices); r=Ms2ger
This PR replaces all occurrences of Atom::from_slice("sizes") with atom!("sizes"). It also updates string_cache to v0.1.17 from 0.1.16.

Right now I've split the crate update and the replace in different commits - should I squash them?

Fixes #8488.

Source-Repo: https://github.com/servo/servo
Source-Revision: c722e0e6f4de9de1b22ca6a8fa58ec5f49caa729
2015-11-15 17:57:33 +05:01
Ms2ger 39257ad287 servo: Merge #8515 - Update string_cache_shared (from servo:usc); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 4f855dc63a0b6cc80737972ab3f79953321a900b
2015-11-13 22:31:33 +05:01
Ms2ger 80eca7adcc servo: Merge #8510 - Update mozjs (from servo:mozjs); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 50be4bb09ea42926a3bddb75a024e92a75e2047e
2015-11-13 19:20:35 +05:01
Corey Farwell 0fcc30f78d servo: Merge #8504 - Prefer atoms over strs for string comparisons (from frewsxcv:more-atoms); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1763a37e3be8be46dc86bf4bf76bcd7c892566da
2015-11-13 10:27:13 +05:01
Ms2ger 3890fca29d servo: Merge #8428 - Update js (from Ms2ger:conversions); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: b40882093a306032d38ad02e30f0095e0a49ec21
2015-11-13 00:44:52 +05:01
Ms2ger ffd1877846 servo: Merge #8378 - Reduce LayoutTaskData to the fields used for RPC (from Ms2ger:rwdata); r=eefriedman
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d21158eb3bc8cb64a1953ab77b57e813bd429ed
2015-11-10 07:18:45 +05:01
Lars Bergstrom 9acccdde15 servo: Merge #8387 - Update mozjs (from larsbergstrom:update_mozjs); r=Manishearth
r? @Manishearth

This mainly just picks up the support for ccache. I'd like to get one module using it to land to see how it works on Travis & the builders (probably should have done this along with #8366).

Source-Repo: https://github.com/servo/servo
Source-Revision: 7c4fd5e77078b523ae368f42c7d43c9d76acaf50
2015-11-07 20:00:58 +05:01
Corey Farwell 75aebe6c02 servo: Merge #8249 - 'type' attribute on HTMLInputElement should be stored as an Atom (from servo:htmlinputelement-type-atom); r=nox
Fixes #8180

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ace7bc09087b6bfa817047640ba15df997b4a91
2015-11-07 18:38:51 +05:01
Ms2ger 0c3d6d4f36 servo: Merge #8370 - Update js (from Ms2ger:update-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8c0f0a22d2a574027c35272dba76ab9713e39652
2015-11-07 07:42:19 +05:01
Simon Sapin 003146d5d2 servo: Merge #8343 - Fix some custom properties bugs (from servo:custom-properties); r=mbrubeck
Fix #7767.

Source-Repo: https://github.com/servo/servo
Source-Revision: faf2f34772fe06396a7b8542b00f0566832bc7ef
2015-11-07 05:33:36 +05:01
David Zbarsky e69242f014 servo: Merge #8304 - Cleanup some unneeded let bindings (from dzbarsky:borrowck); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 69e6eb4d91ab1bd8f363ee7425e4f921ca006a1e
2015-11-07 01:02:40 +05:01
Matt Brubeck 6778a55e8e servo: Merge #8357 - Upgrade to latest glutin (from mbrubeck:glutinup); r=metajack
Includes servo/glutin#52 and servo/glutin#53.

r? @glennw cc @vvuk

Source-Repo: https://github.com/servo/servo
Source-Revision: 65a0bb4aefad7b1cfcce2f5d1f01b081483001e8
2015-11-05 23:30:04 +05:01
Lars Bergstrom 0b806539c8 servo: Merge #8288 - New Android suppport (from larsbergstrom:new_android_build); r=mbrubeck
r/f? @mbrubeck

No need to r+ urgently; I want to do a little bit more testing of the release build, but I'm hoping to land this bit (moving to a more sane build process) next week.

The new version of building an APK:
1) Removes the glutin-based APK builder from the link step
2) Adds a build.rs step to the build of the final Servo library that adds the native code required by glutin's android_rs_glue (e.g., `ANativeActivity_onCreate` definition)
3) Replaces the link step with a `fake-ld.sh` script that instead creates a libservo.so
4) Adds a new mach `package` step to build the APK that has some Rust code that builds the library from a set of in-tree build files

This setup fixes a number of problems:
1) We can use gdb, because we use `ndk-build`, which adds the .gdbserver info, plus we keep around all of the build files (also required by the ndk gdb)
2) We can add more Java code & hooks to handle Android intents
3) We no longer have any git submodules or the awkward two-step build with android-rs-glue

Many other setups were tried (and failed). The most obvious ones is building a libservo.so from a `dylib` target from the servo build on Android. This doesn't work because you can't have a different default lib target on one platform than others in Cargo, and you also can't pass it in from the commandline (e.g., --lib does not have a dylib arg). Additionally, if you don't go through the intermediate libservo.rlib step (which removes unused symbols), then you end up with a TON of missing symbols because our -sys crates are super sloppy about that. I spent a few weeks beginning to clean them up, but since it's something we can't easily enforce (and new -sys packages will have this problem, too, since it's only an issue with the Android loader), it made more sense to me to just have the build set up to discard those unused bits of code before they ever get to the linker, much less the loader.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0699d38e80c029a384354da96596421f3a97ceef
2015-11-05 05:22:48 +05:01
Matt Brubeck e52999f7a9 servo: Merge #8317 - Fix unused import warning in headless builds (from mbrubeck:glutin-warning); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 488459f80196a9d080dff9a57bfe0899c4c4ee68
2015-11-04 09:05:24 +05:01
Matt Brubeck 4b6e081f7b servo: Merge #8232 - Correct event dispatching for multiple simultaneous touch points (from mbrubeck:glutin-touch); r=glennw
Instead of just converting the mouse into a single "touch" input, Servo can now listen for multi-touch events from Glutin, maintain a list of active touch points, and dispatch events for all of them.

r? @glennw (for the compositor changes) and @jdm (for the DOM changes)

Source-Repo: https://github.com/servo/servo
Source-Revision: 3fdaa6e3f32f6996c416e75119177b98d404adb2
2015-11-03 22:16:21 +05:01
Martin Robinson d989852fdd servo: Merge #8223 - Make executing synthesized pinch zoom more similar to zoom (from mrobinson:pinch-zoom-2); r=pcwalton
Synthesized pinch zoom was removed in #8121 so that this combination of
mouse wheel and key press can be handled by the page. I mistakenly
re-implemented it #8215. In order to preserve synthesized pinch zoom,
which is very useful for testing on desktop computers, have it work
similarly to page zoom except with the ALT key pressed.

Source-Repo: https://github.com/servo/servo
Source-Revision: 526a3c8df3882c83a0512dbb341cf7f1781ac402
2015-11-03 18:53:38 +05:01
Emilio Cobos Álvarez 8641baaa51 servo: Merge #8291 - Add destructors to some WebGL objects, remove duplicated glutin dependency and try to enable the webgl reftests (from emilio:webgl-drop); r=jdm
The first commit allows to cleanup the gl resources of the webgl task earlier if they aren't being used.
Right now all resources were cleaned up when the context was destroyed, so I think this is
a slightly better approach.

The second commit bumps rust-offscreen-rendering-context to remove the duplicated glutin dependency.

The third one tries to reenable the webgl reftests.
Since the errored builds are deleted, It's the only way I can try to troubleshoot it.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3282174a9941ec1f8d8821dfac44b850b77e7668
2015-11-02 18:23:33 +05:01
nxnfufunezn 72d5e9f8e2 servo: Merge #8192 - Accept Brotli-compressed HTTP responses #8156 (from nxnfufunezn:brotli-decompressor); r=jdm
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 2e4454a42356c0ea9edf67f96922ac96e4d52900
2015-11-01 22:44:21 +05:01
Bobby Holley 767285b863 servo: Merge #8274 - Implement state-based restyle hints (from bholley:state_restyle_hints); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 959ae86bd0435bf67626d3203a220c0e9f2eea40
2015-11-01 06:54:51 +05:01
Bobby Holley 5db6816cd0 servo: Merge #8162 - Centralize event states in rust-selectors (from bholley:centralize_event_states); r=pcwalton
This still needs a rev bump on rust-selectors once https://github.com/servo/rust-selectors/pull/55 gets merged.

Source-Repo: https://github.com/servo/servo
Source-Revision: 521a87180a85709f8f704df33537f79bd131bf71
2015-10-31 09:36:45 +05:01
Martin Robinson 5672e44e9c servo: Merge #8244 - Expand DisplayList layer bounds to whole pixels (from mrobinson:layer-size); r=pcwalton
Before passing these layers to the paint task, expand them to pixel
boundaries. This ensures that subpixel edges of the layer will not be
clipped away and helps prevent rounding issues with layer contents.

Fixes #8166.

Source-Repo: https://github.com/servo/servo
Source-Revision: 94ca87e7ddc07160b9205c0112b60b0a951f0742
2015-10-29 06:26:10 +05:01
Matt Brubeck f42dc56081 servo: Merge #8229 - Disable debug logging in release builds (from mbrubeck:debug-log); r=larsbergstrom
This uses the new `release_max_level` feature added in rust-lang-nursery/log#58 to turn the `debug!` and `trace!` macros into no-ops in optimized builds.

r? @pcwalton (or anyone else who wants it)

Source-Repo: https://github.com/servo/servo
Source-Revision: 9501564e0143f134297bc1fd339883f7f987c283
2015-10-29 02:38:01 +05:01
Ms2ger 6089351099 servo: Merge #8242 - Update js (from Ms2ger:update-js); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 30ce2a84c162915f71873e9e20955e12709b39ae
2015-10-28 23:06:40 +05:01
Manish Goregaokar 0869f53e87 servo: Merge #8241 - Update euclid to 0.3 (from Manishearth:euclid_up); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d699a2b4419632e31b35352c518e2ef5ffcc9a3
2015-10-28 21:32:15 +05:01
Alan Jeffrey 5d19ecc6d6 servo: Merge #8224 - Upgrade glutin and related packages (from mbrubeck:glutinup); r=frewsxcv
Updated version of #8172.

Source-Repo: https://github.com/servo/servo
Source-Revision: 98dc67dbec7f4f9a6d8b62d75a9b2e0aca91eb7d
2015-10-27 23:30:53 +05:01
Martin Robinson 62da234ead servo: Merge #8215 - Implement pinch zoom emulation to the glutin port (from mrobinson:glutin-pinch-sim); r=glennw
The GLFW port had pinch zoom emulation that could be triggered by
holding control and using the mouse wheel. This was very useful for
testing pinch zoom behavior on desktop machines. This commit
implements this for the glutin port.

Source-Repo: https://github.com/servo/servo
Source-Revision: e49c7a3acbc36549e52f99ad67048f5e31352bad
2015-10-26 21:01:00 -05:00
Ms2ger ac7eb40a9e servo: Merge #8195 - Update js (from Ms2ger:update-js); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1982ae38e33a64396bd2174cba5925b62a7715e0
2015-10-25 14:23:57 -05:00
Matt Brubeck ab57828df0 servo: Merge #8163 - Enable multitouch in Glutin (from mbrubeck:glutin-multitouch); r=glennw
This tells Glutin's Android and iOS back-ends to send events for more than one
pointer at a time.

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 28f4dd4f4806bfc2496bebcdedc3120731f14da2
2015-10-23 06:13:28 -06:00
Antonio de Luna c5df265cfe servo: Merge #8161 - Fixes #8154 Convert match to `if let` in handle_window_event (from A-deLuna:fix-#8154); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 51ab0abb7f7663e6113246fd7bc525e5f4f0281b
2015-10-23 05:35:33 -06:00
Paul Rouget 75219d581c servo: Merge #8121 - make it possible to disable default keybindings (from paulrouget:disableControls); r=jdm
For browser.html, we want to let the top level webpage handle these keybindings.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d4641b640627da2a6f30b688d728f0a730671f6
2015-10-22 08:38:01 -06:00
Corey Farwell be6e7de7f6 servo: Merge #8103 - Upgrade some dependencies (from frewsxcv:bump); r=nox
Check each commit for a link to the changelog

Source-Repo: https://github.com/servo/servo
Source-Revision: 12c618450bc5639901ad499e59e7e4190097a693
2015-10-21 16:02:20 -06:00
benshu 7eac66ba86 servo: Merge #7450 - Ordering guarantees for timers (from benschulz:constellation-timer); r=jdm
This is an rough solution to the issue described in #3396. XHRs still do their own thing and an overall clean up is in order. Before I do that, though, I'd really like someone to sign off on the overall idea.

There's one major difference to what jdm layed out #3396: The timers remain with the window/worker and only the earliest expiring one is coordinated with the dedicated timer thread.
That means both the timer thread and the window/worker have to keep track of which timer expires next, which feels a bit wonky. However, the upshot is that there's no need for communication with the timer thread when a pipeline is frozen, thawed or dropped.

Most relvant parts are
 - the [`TimerScheduler`](6f5f661958 (diff-74137a6f50ab38e7a1e4d16920a66ce7R73)), which is the new per-constellation timer task and
 - the [`ActiveTimers`](6f5f661958 (diff-86707d952414a2860b78bcf6c1db8e2eR34)) which is what's left on the window/worker side.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2de5407cdabef67ed03b2ad4edf4a22541d77875
2015-10-21 09:07:30 -06:00
Paul Rouget b8b8e6483e servo: Merge #8119 - update image to 0.4.0 (from paulrouget:updateImage); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 7fb3c51bbbbc708b1472cb79751349adff8b9501
2015-10-21 00:47:27 -06:00
Martin Robinson 7f9d8e7d86 servo: Merge #7950 - Integrate iframes into the display list (from mrobinson:layerize-iframes); r=pcwalton
Instead of always promoting iframes to StackingContexts, integrate them
into the display list. This prevents stacking bugs when
non-stacking-context elements should be drawn on top of iframes.

To accomplish this, we add another step to ordering layer creation,
where LayeredItems in the DisplayList are added to layers described by
the LayerInfo structures collected at the end of the DisplayList.
Unlayered items that follow these layered items are added to
synthesized layers.

Another result of this change is that iframe layers can be positioned
directly at the location of the iframe fragment, eliminating the need
for the SubpageLayerInfo struct entirely.

Iframes are the first type of content treated this way, but this change
opens up the possibility to properly order canvas and all other layered
content that does not create a stacking context.

Source-Repo: https://github.com/servo/servo
Source-Revision: 11d23a41b31c2b2846d1e9c6b40e87ba7e2a095f
2015-10-20 16:01:38 -06:00
Michael Wu e4dfd5fc9a servo: Merge #7727 - Support the updated spidermonkey bindings (from michaelwu:update-bindings); r=jdm
Still need to finish the rust-mozjs update and make cargo use it, but it's close enough that I don't expect much to change on the servo side.

Some changes here
- bools are properly translated now
- char16_t is handled as u16 now
- JS_GlobalObjectTraceHook isn't mangled now
- JSJitInfo has been adjusted
- A const fn is used to generate bitfields in JSJitInfo
- Manually generating handles now requires calling an unsafe function. It's not actually required, but it's too much of a hassle to generate them manually now due to bindgen++ adding base classes now.

Source-Repo: https://github.com/servo/servo
Source-Revision: b34fd5bd7e55be1d577df5cf70b41af8a6cc716b
2015-10-14 14:48:44 -06:00
Glenn Watson 0e52e5830d servo: Merge #7989 - Update gleam 0.1.9 -> 0.1.13 (from glennw:update-gleam); r=frewsxcv
Update gleam 0.1.9 -> 0.1.11

Source-Repo: https://github.com/servo/servo
Source-Revision: dd2f8b6891f963a6c0cf42be9212e85a86a77df7
2015-10-13 19:15:39 -06:00
Ms2ger d28c6e55d4 servo: Merge #7991 - Update cssparser (from Ms2ger:update-selectors); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8cb3c5f6287146f8a5c351b72fb135de5b283b33
2015-10-13 11:39:43 -06:00
Matt Brubeck fd3bcc3b9b servo: Merge #7933 - Replace libpng and stb_image with PistonDevelopers/image (from mbrubeck:piston-image); r=glennw
Fixes #3368. r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 0f597d389052500d9b76b9f9f89e873e6f809ab1
2015-10-12 15:06:31 -06:00
Simon Martin 3873b7794f servo: Merge #7957 - Issue #7905: Restore "headless" build on not Linux platforms (from simartin:ticket_7905); r=mbrubeck
Fix https://github.com/servo/servo/issues/7905 by implementing WindowMethods' native_display  in headless mode on "not Linux" platforms.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6303126e0c48e9c83aa7edd813079a6a360837b2
2015-10-12 12:02:43 -06:00
Connor Imes 1145c446b0 servo: Merge #7961 - Update dependencies with fixes for native ARM builds (from connorimes:arm-crate-updates); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 71c5587856048708906cf3adb6952116f224d40e
2015-10-12 01:42:25 -06:00
Avi Weinstock 5dcd1c9576 servo: Merge #7952 - Update clipboard to a version with chdir("/") removed (from aweinstock314:update-clipboard-20151009); r=mbrubeck
Relevant links:
http://logs.glob.uno/?c=mozilla%23servo&s=9+Oct+2015&e=10+Oct+2015#c279844
ef4cf77c9c

Source-Repo: https://github.com/servo/servo
Source-Revision: 28969f1f33cd0144fbdb9dc3cbd68dbb4b79352f
2015-10-09 19:52:13 -06:00
Martin Robinson 2bdc604c66 servo: Merge #7913 - Simplify and unify compositor shutdown code paths (from mrobinson:compositor-shutdown); r=pcwalton
Unify all compositor shutdown code paths into two methods, one which
starts the shutdown and the other that finishes it. This simplifies the
way the compositor shuts down and prevents "leaking" pixmaps when
exiting in uncommon ways.

Source-Repo: https://github.com/servo/servo
Source-Revision: 26dd1233103eb75c2e94fcc2ba34c18fa4432afc
2015-10-07 21:28:39 -06:00
Manish Goregaokar 484e56a8a6 servo: Merge #7884 - Update openssl and re-enable the resource task tests (from Manishearth:fx-openssl); r=Ms2ger
https://github.com/sfackler/rust-openssl/issues/281 landed

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 5730a8bdd137006bbbf8f33bcc3b8828c70d3a73
2015-10-06 10:43:41 -06:00
Lars Bergstrom 8f1cc7b90f servo: Merge #7837 - Rust upgrade to nightly 20151002 (from larsbergstrom:rustup_20151002); r=Manishearth
r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 375382a2e813ee28405f6cec439330e238c4d2e5
2015-10-05 10:23:44 -06:00
Paul Rouget ed09d5da65 servo: Merge #7812 - enable vsync on osx (from paulrouget:vsyncOsx); r=glennw
fixes https://github.com/servo/servo/issues/7783

Source-Repo: https://github.com/servo/servo
Source-Revision: fd66620602474e2070dc6fd6429e64cc6145b01c
2015-10-01 02:08:34 -06:00
Patrick Walton 82da2292ff servo: Merge #7802 - Handle zero-sized source surfaces properly, and upgrade `ipc-channel` to incorporate the fix for zero-sized shmem on Mac (from pcwalton:zero-size-source-surfaces); r=mbrubeck
Depends on servo/rust-azure#201 and pcwalton/ipc-channel#10.

Closes #7422.

r? @mbrubeck (don't r+ until the upstream dependencies have landed)

cc @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: e2048d57c4c0602c5a6b82db8cb76e6c3e5467fa
2015-10-01 00:08:34 -06:00
Glenn Watson ad94e13b24 servo: Merge #7811 - Update servo to use published app units crate (from glennw:use-crates-au); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 0860be4c28ebaee36a0df4de3510d917b0e08cb7
2015-09-30 22:21:36 -06:00
Paul Rouget 7dc81d1480 servo: Merge #7778 - Add a command line option to disable native titlebar (from paulrouget:decorationLessOption); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d92e781a87b5a998f06580fa959c3ccb5cf14dcf
2015-09-29 13:45:57 -06:00
Matt Brubeck 0839cfd14e servo: Merge #7742 - Update unicode-bidi to 0.2.2 (from mbrubeck:update-bidi); r=Manishearth
Fixes #7701 via servo/unicode-bidi#17.

Source-Repo: https://github.com/servo/servo
Source-Revision: d39c8546b6bf03c69b1cde925c72722dfd61e588
2015-09-25 14:23:50 -06:00
James Graham c18b23949d servo: Merge #7651 - Implement resettable and String-valued prefs (from jgraham:prefs_reset); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: e04c2c78ee43ad81f2794d908a13744b6b976443
2015-09-25 08:18:06 -06:00
Ms2ger 4ccbcec8e1 servo: Merge #7728 - Remove the now-stable box_raw feature gate from cef (from Ms2ger:box-raw); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 2d253cbf835df522595575fdd371e2068606271a
2015-09-24 10:37:40 -06:00
Ms2ger 5afeb71b23 servo: Merge #7717 - Update dependencies (from servo:depup); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 705ad72aee58b4fc636bca3a2784c7643048336d
2015-09-23 10:57:55 -06:00
Manish Goregaokar a0f53e1f0e servo: Merge #7697 - Rust upgrade to rustc 1.5.0-dev (6217b002b 2015-09-21) (from servo:rustup_20150921); r=Ms2ger
Snapshot doesn't exist yet. Rust master+ should work.

Also https://github.com/serde-rs/aster/pull/33 hasn't merged yet.

r? @Ms2ger @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: f7f16870bebdc9359661544054259b37780f1331
2015-09-23 06:45:18 -06:00
Lars Bergstrom 8c59634c70 servo: Merge #7713 - Update Cargo.lock files with linker updates for cleaner static linking (from larsbergstrom:update_linker_locks); r=glennw
r? @metajack @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: eca448363de576cf0108ac4d37fbbe1aeb659598
2015-09-22 19:37:22 -06:00
Brandon Fairchild f7fb1e4b4a servo: Merge #7662 - Check for multiple import blocks separated by whitespace (from nerith:import); r=frewsxcv
Fixes #7381.

Source-Repo: https://github.com/servo/servo
Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249
2015-09-19 13:34:51 -06:00
Hugo Thiessard 357588437d servo: Merge #7680 - fixes #7390 : tidy now check the order of mod declarations even whith attribute (from Mylainos:Issue-#7390); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: d1b85de762c0193276010a019f931526c34c04ce
2015-09-18 14:44:48 -06:00
Matt Brubeck 20c49e9242 servo: Merge #7664 - Update glutin to latest upstream merge (from mbrubeck:glutinup); r=glennw
To pick up servo/glutin#47. r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 3030eff4c6af5aa4fefbc9f12fc011c6b2093834
2015-09-17 23:36:18 -06:00
Simon Sapin 7e1ff1e8fe servo: Merge #7555 - Custom properties, take 2 (from SimonSapin:custom-properties++); r=mbrubeck
Support `var()` in shorthand properties, and fix various bugs.

r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b6d4daf85d672265824a014dba99c94c8c08814
2015-09-17 06:50:57 -06:00
Jinwoo Song 2a438e5141 servo: Merge #7605 - Implement "transform: skew()" (from nox:skew); r=mbrubeck
Thanks to @Jinwoo-Song for the original commit, which I just rebased and cleaned up. Fixes #6237.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6a12f00d6d392651bae10365b4c806f36d704b21
2015-09-16 06:31:48 -06:00
James Graham ee9e4cd83d servo: Merge #7548 - Add get/set pref extensions to webdriver server (from jgraham:webdriver_prefs); r=metajack
This can be used by the test framework to ensure that the correct prefs are
set for a test without restarting the browser

Source-Repo: https://github.com/servo/servo
Source-Revision: 67cf241acdeb58d05cf2150224ee7ea9e43f0669
2015-09-14 22:08:28 -06:00
zmike e9f92267ef servo: Merge #7629 - sync cef interfaces with upstream (from zmike:THE_RETURN_OF_EMBEDDING); r=larsbergstrom
@larsbergstrom I guess

Source-Repo: https://github.com/servo/servo
Source-Revision: 3d420abe405275e673de8f3b8a6f33ca94fb7612
2015-09-14 14:24:18 -06:00
Corey Farwell e074261c2a servo: Merge #7614 - Fix a few incorrect Element interfaces (from frewsxcv:incorrect-element-interfaces); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: dbd614045b415640c0d466a68ea26cd94ece356c
2015-09-13 06:23:42 -06:00
Mathieu Rheaume fe567c36c0 servo: Merge #7559 - Remove 'get_*' on getters as per RFC 0344 on canevas, compositing, devtools, gfx, layout, net, profile, servo and webdriver_server (from ddrmanxbxfr:RFC-0344-Work); r=nox
Hi guys,

I just gave a big pass of RFC-0344 as per issue #6224 .

Pretty much renamed all the get_* fn that were used to fetch values.

I hope I didn't rename too much.

As said in the issue discussion, I didn't touch at the scripts folder so we keep the unsafe ones pretty explicit.

I've ran the whole pass of test, everything seems to be still working right :).

Please give feedback on this PR.

Thanks for looking into it.

Source-Repo: https://github.com/servo/servo
Source-Revision: b05f4aa3aa3085e65cb75433ae37bf272216d033
2015-09-12 18:29:56 -06:00
Connor Imes 0214babbfa servo: Merge #7595 - Refresh cef and gonk lock files; update heartbeats dependencies (from connorimes:update-hbs); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: f190ba360e41465d43972826b6715eb39e7b9822
2015-09-10 13:31:57 -06:00
Jack Moffitt ded3151517 servo: Merge #7594 - Fix compiler warnings (from metajack:embedding-warnings); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: e6ed6250b795682c41a65a5cf536321fa1621315
2015-09-10 09:42:33 -06:00
Jack Moffitt b137d4f8c3 servo: Merge #7583 - Fix some build warnings (from metajack:warning-police); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 50f5ae1d358cd5472ad3f7f72d05568e44ec8932
2015-09-09 12:53:21 -06:00
Akos Kiss c05804b21a servo: Merge #7576 - Bump up skia and js packages to follow recent fixes (from akosthekiss:bump-skia-js); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 0d37e8f96b7f40d14bf4fbb0b66e42a01302a336
2015-09-09 04:37:08 -06:00
Eli Friedman 4875f833cb servo: Merge #7523 - Fix up some unnecessary uses of `unsafe` (from eefriedman:unnecessary-unsafe); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: be9a9ffda10fa2c50b13f79dabd49255f29f12f6
2015-09-09 00:05:17 -06:00
Anthony Ramine d078f1011a servo: Merge #7531 - Implement <template> (from nox:template); r=Ms2ger
All tests using iframes can't currently pass, same for innerHTML-related tests with <template> elements. The latter contradicts the spec, see the links below.

Apart from this, they work, AFAICT.

https://github.com/servo/html5ever/issues/164
https://www.w3.org/Bugs/Public/show_bug.cgi?id=27314

Source-Repo: https://github.com/servo/servo
Source-Revision: 5a0be12e43f92fc64b1d8f5d35f9dadaa4b53521
2015-09-08 02:29:00 -06:00
Matt Brubeck e9926732de servo: Merge #7543 - Update glutin (from mbrubeck:glutin-up); r=pcwalton
To servo/glutin#46

Source-Repo: https://github.com/servo/servo
Source-Revision: f8ba9a81116e11249845189c6af8978df1693c4b
2015-09-04 10:23:58 -06:00
Simon Sapin 1b93452113 servo: Merge #7518 - Initial support for CSS Custom Properties (from servo:custom-properties); r=pcwalton
https://drafts.csswg.org/css-variables/

Missing:

* `var()` in shorthand property declarations.
* Correct handling of EOF in custom property declarations.

r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 05deb3dcc8be9a0a623536467628aa68ae754918
2015-09-03 16:09:02 -06:00
Matt Brubeck 2393e84084 servo: Merge #7443 - Implement get_table_for_tag on FreeType (from mbrubeck:get_table); r=pcwalton
Updates freetype to pick up servo/rust-freetype#37

r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: 0ad284766b3f12097dce1e5858b5d07e870478eb
2015-09-03 14:37:38 -06:00
Corey Farwell 08effb93a3 servo: Merge #7526 - Upgrade rust-block to silence warning (from frewsxcv:bump-no-warnings); r=jdm
https://github.com/SSheldon/rust-block/pull/1

Relevant to https://github.com/servo/servo/pull/7513

Source-Repo: https://github.com/servo/servo
Source-Revision: 3a09c027e2f19b3b0fdf0b55730532b942103411
2015-09-02 22:57:13 -06:00
Eli Friedman dc0d48fb63 servo: Merge #7525 - Cut required desktop OpenGL version from 3.0 to 2.1 (from eefriedman:ogl-version-requirement); r=glennw
Mesa software rendering on Ubuntu 14.04 only claims to support OpenGL 2.1,
so servo crashes on startup.  It seems to work fine if an OpenGL 2.1 context
is requested.

Source-Repo: https://github.com/servo/servo
Source-Revision: 625b4938efbaf45cb4a9802796bd3e29bb9be376
2015-09-02 21:12:34 -06:00
Ms2ger 5fc94f81ad servo: Merge #7515 - Lint devtools (from Ms2ger:devtools-lint); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b1b8258a87cf4db69039057124057b0906186d43
2015-09-02 12:32:44 -06:00
Sean McArthur 0316cdde51 servo: Merge #7418 - Enable HTTP connection pooling (from jdm:httppool); r=jdm
Rebased and adjusted version of #6948. Closes #6948.

Source-Repo: https://github.com/servo/servo
Source-Revision: 366d4a83f1448e115cf998cc6c4e8c564773da65
2015-09-02 10:48:07 -06:00
Corey Farwell 0b7018a49c servo: Merge #7513 - Upgrade some dependencies to silence warnings (from frewsxcv:bump-no-warnings); r=Ms2ger
In order to pick up these changes:

* servo/euclid#101
* netvl/xml-rs#102
* jgraham/webdriver-rust#17
* ecoal95/rust-offscreen-rendering-context#27

Source-Repo: https://github.com/servo/servo
Source-Revision: b7c88dd547c01d99c77c90329cc09f13a90a53b7
2015-09-02 09:42:29 -06:00
Simon Sapin ea7357b400 servo: Merge #7509 - Upgrade to rustc 1.4.0-dev (cb9323ec0 2015-09-01) (from servo:rustup_2015-09-01); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: f49615ca7b5d98ee603cf42f705073fbe4d414fb
2015-09-02 01:31:23 -06:00
Martin Robinson 401bdcb59c servo: Merge #7503 - Upgrade to the latest rust-layers (from mrobinson:iframe-issue); r=glennw
This should fix a bug where hidden iframes are not properly clipped
away from the compositor scene. This commit adds a test for this
behavior.

Fixes #6849.

Source-Repo: https://github.com/servo/servo
Source-Revision: ba2cb77c26006dc378553d757e88de8ab86c4d5b
2015-09-01 22:18:52 -06:00