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

63 Коммитов

Автор SHA1 Сообщение Дата
Anthony Ramine de5ae52b90 servo: Merge #14292 - Update to Rust 1.15.0-nightly (1c448574b 2016-11-28) (from servo:rustup); r=KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: f159b5cb1028bf4d2f75b0b48055fe19a8032f8e
2016-11-29 12:20:58 -08:00
Martin Robinson bd80dcc63d servo: Merge #14386 - Use new DisplayListBuilder improvements in Servo (from mrobinson:display-list-builder-updates); r=glennw
<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1c6963144d0496d8dcbb7a7ca6782d01d3305441
2016-11-29 02:36:05 -08:00
Anthony Ramine e20c332d45 servo: Merge #14381 - Move to Cargo workspaces (from servo:workspaces); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: eb7032f6dd5e8a1f8c0602666805d1d10cc84e65

--HG--
rename : servo/ports/servo/Cargo.lock => servo/Cargo.lock
2016-11-28 01:44:40 -08:00
Simon Sapin 2d8a1f7245 servo: Merge #4140 - Move the root Cargo.toml to components/servo, and warn when Cargo is run directly (from SimonSapin:no-root-cargo-toml); r=SimonSapin
This fixes #3957, and allow #4115 not to regress #4099.

Source-Repo: https://github.com/servo/servo
Source-Revision: 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b

--HG--
rename : servo/Cargo.lock => servo/components/servo/Cargo.lock
rename : servo/src/lib.rs => servo/components/servo/lib.rs
rename : servo/src/main.rs => servo/components/servo/main.rs
2014-12-02 19:27:51 -07:00
Martin Robinson 05cadfd2fd servo: Merge #4074 - Update rust-layers to fix empty BufferRequest failures (from mrobinson:empty-tiles); r=jdm
rust-layers will now avoid sending empty buffer requests which can
cause failures when Servo tries to create empty platform surfaces.

Fixes #4060.

Source-Repo: https://github.com/servo/servo
Source-Revision: b33c31b5748ddfe4f1aec5f0813b47dc74adf604
2014-11-23 09:09:36 -07:00
Glenn Watson 0d90c86c04 servo: Merge #4052 - Make glutin work on mac (from glennw:update-glutin); r=larsbergstrom
- Update glutin, and update rust-cocoa to use the servo fork now that upstream is up to date.
- Some events and resizing are still not working correctly on mac yet.

Source-Repo: https://github.com/servo/servo
Source-Revision: b4c3aec383b2b1cd19ab6267775f9fb3735aa977
2014-11-21 08:51:31 -07:00
Glenn Watson 8a83aa075e servo: Merge #4035 - Remove rust-alert as it's broken on mac, and unimplemented on other platforms (from glennw:remove-rust-alert); r=pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 554f696db81665f92e9976a15d986b0fd0f99edf
2014-11-18 21:30:27 -07:00
Glenn Watson c04e3b2bc7 servo: Merge #4028 - Add glutin port (supported on Linux only currently) (from glennw:glutin); r=larsbergstrom
Default build uses glfw, but glutin can be enabled via:

./mach cargo build --no-default-features --features=glutin

Remaining work:
 * Mac
 * Android
 * hi-dpi
 * nested event loop

This PR also enables true headless (without X) rendering on Linux by specifying the rendering API as Mesa.

Source-Repo: https://github.com/servo/servo
Source-Revision: f5c6146de0b3bfda97edff6662033f4a981df3f6
2014-11-18 15:48:29 -07:00
Simon Sapin bc85e619ae servo: Merge #4016 - Fix freetype build (from SimonSapin:fix-freetype-build); r=Manishearth
Pick up https://github.com/servo/libfreetype2/pull/3

r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: bd4f94a11f556451634ac073e690fa42816e5580
2014-11-17 08:30:31 -07:00
Glenn Watson a9771bc8d8 servo: Merge #4012 - Update green-rs submodule to get android tls fix (from glennw:update-green-rs); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: a51d08737a1f7337f6fad1d3f28b11345fed70e2
2014-11-16 20:21:28 -07:00
Glenn Watson 7ecba6a00a servo: Merge #4011 - Update gleam submodule, and use glfw to load OpenGL function pointers (from glennw:gleam-update); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 3da9ad464db7e3a422e06f82285aff15b7375344
2014-11-16 16:09:28 -07:00
Simon Sapin 05c514b3b2 servo: Merge #3980 - Use freetype-sys on Linux (from SimonSapin:freetype-sys-linux); r=larsbergstrom
See:
https://github.com/servo/libfreetype2/pull/2
https://github.com/servo/skia/pull/38
https://github.com/servo/rust-azure/pull/114

Let’s close #3867, even though this only works around and doesn’t fix the underlying issue.

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 644765ea5e5a7981f3c35f74c10e2c744409c2a9
2014-11-15 12:48:29 -07:00
Matt Brubeck 8f62c2a692 servo: Merge #3985 - Update Cargo.lock files for Android rustup fixes (from mbrubeck:android-green); r=larsbergstrom
r? @glennw

Source-Repo: https://github.com/servo/servo
Source-Revision: e3ee984f1747b27e66b80c8418af7ce51739880d
2014-11-14 15:03:35 -07:00
Glenn Watson 22c4035692 servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
Martin Robinson 8cec6a7fbe servo: Merge #3809 - Clip display list based on frame viewport (from mrobinson:display-list-optimization); r=pcwalton
Instead of creating a display list for the entire page, only create one
for an area that expands around the viewport. On my machine this makes
incremental layout of http://timecube.com 50% faster.

Source-Repo: https://github.com/servo/servo
Source-Revision: 26045d7fcbab8851fbefe2851cd904203f8fd8dd
2014-11-12 17:36:32 -07:00
Glenn Watson baab1dcc7f servo: Merge #3922 - Update cargo to get fix for pinned dependencies of features (from glennw:update-cargo); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: fa7596015addedc4db50ce735100d7560482011d
2014-11-06 15:36:29 -07:00
Patrick Walton 35e2f9710a servo: Merge #3761 - Invert control flow, fix resizing, and improve checkerboarding significantly (from pcwalton:smooth-scrolling); r=larsbergstrom
r? @glennw @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: ffae1104989c0177b483d591a482e5cd877183c2
2014-11-04 18:12:32 -07:00
Glenn Watson c3fd7b82f4 servo: Merge #3861 - Update azure. This removes the final rust-opengles dependency (from glennw:update-azure); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 37bbe352a862f931f061a37eeaac9ebbddf79a04
2014-10-30 15:57:38 -06:00
Glenn Watson a6fb05afeb servo: Merge #3851 - Update to use new GL bindings (from glennw:servo_gl); r=glennw,metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f9b84fd8704e249682cc12dfeb2da61b39a88d92
2014-10-29 23:33:35 -06:00
Glenn Watson cfd1172702 servo: Merge #3846 - Update to use CGL crate for mac (from glennw:cgl); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: b8de54bc63a27ec55db683bba7430cbd0e4aa9e4
2014-10-29 09:24:40 -06:00
Glenn Watson 779c6bd37a servo: Merge #3845 - Update layers, opengles to use the new glx bindings (from glennw:update-layers-opengles); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: f632f644391c2f49ec870ceb713a108e268f384b
2014-10-28 23:12:40 -06:00
Glenn Watson 18ad335174 servo: Merge #3842 - Update azure to remove glfw dependency (from glennw:update-azure); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: b68f72380b4ccc330f7989fd773011360900ad1a
2014-10-28 22:15:38 -06:00
Clark Gaebel 1df0853045 servo: Merge #3827 - Run all task spawning through util, to allow for easy hooking (from cgaebel:use-custom-spawn); r=pcwalton
During debugging, I found it useful to hook all task creation in a
central location, and util::task was the perfect place for it.

r? @pcwalton (or maybe someone else, I'm kinda sending you a bunch of
reviews today because I don't know who better to give them to)

Source-Repo: https://github.com/servo/servo
Source-Revision: ff06be91ebe770290ba912ee71a303810aa62cea
2014-10-28 11:24:43 -06:00
Glenn Watson dfb5051db6 servo: Merge #3816 - Fix cargo.lock that got out of sync when two successive commits (1) updated the SHA (2) added the dependency to util with the old SHA (from glennw:cargo-lock-fix); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 005cfed6e99069e0d7f50414db7aab32411872a8
2014-10-26 16:12:38 -06:00
Josh Matthews 853c1f1058 servo: Merge #3801 - Add missing Cargo.lock deps change (from jdm:utildeps2); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 3be4af057fcf4fc050e0e78330585f8d0d131fc3
2014-10-24 15:21:33 -06:00
Josh Matthews 9bff9dccb5 servo: Merge #3803 - Add an optional --debug-mozjs argument to `mach build` that enables a no (from jdm:mozjsdebug); r=mbrubeck
...n-optimized, debug build of mozjs and rust-mozjs. Update the Cargo snapshot to enable new feature support.

Source-Repo: https://github.com/servo/servo
Source-Revision: e100a1834f40599952a790d2537d2b1262585e82
2014-10-24 14:39:33 -06:00
Glenn Watson 8755e7f008 servo: Merge #3800 - Use WindowMethods to get native graphics metadata instead of relying on azure (from glennw:native-gfx-metadata); r=mbrubeck
This is a prerequisite for glutin support.

Tested on Linux, mac. Tested that android + cef build.

Source-Repo: https://github.com/servo/servo
Source-Revision: a2587462693bf73412a729dfaccb2abb0d3f6ff6
2014-10-23 23:03:29 -06:00
Glenn Watson 9a62901e5b servo: Merge #3799 - Update rust-layers and friends for android build fix (from glennw:update-layers)
Source-Repo: https://github.com/servo/servo
Source-Revision: 44eec48c575e3ed87c8556e7e14a6bd5f6d8aa55
2014-10-23 21:07:21 -06:00
Patrick Walton 797eb6a676 servo: Merge #3749 - gfx: Update rust-azure to pick up arcs, gradients, and subpixel text (from pcwalton:update-rust-azure); r=metajack
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 691e42f7ef9005b2466bff85eee21e0363c77050
2014-10-21 19:54:37 -06:00
Glenn Watson 4c8d7d1845 servo: Merge #3750 - Update rust-core-text, handle empty font collections. Fixes #3703 (from glennw:fix-3703); r=pcwalton
r? @pcwalton @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 1690a40bf4de9183d4e840f0654785a4d4a4e240
2014-10-21 02:12:38 -06:00
Glenn Watson 621989c362 servo: Merge #3745 - Update rust-cssparser to revision required by cssom branch (from glennw:update-cssparser); r=jdm
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: d8cb901f6a38258937e55a8036eb8082052eb285
2014-10-20 19:00:37 -06:00
Glenn Watson 002d5f40a7 servo: Merge #3711 - Remove render backend option as it doesn't work and confuses people (from glennw:cleanup-opts); r=pcwalton
r? @pcwalton @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: a983debaf16d788d500ce12262dc0b9b511b1e8e
2014-10-19 18:00:30 -06:00
Glenn Watson feb4aa791e servo: Merge #3709 - Update rust-mozjs. Also update the android Cargo.lock file (from glennw:update-mozjs); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 9ee87b9cea445d7e73227b625c731f9f58c1efab
2014-10-16 20:24:19 -06:00
Keegan McAllister fb40898c55 servo: Merge #3670 - Use html5ever for HTML parsing (from kmcallister:h5e-take2); r=jdm
r? @Ms2ger, @jdm

The parser is now a JS-managed object and we use hooks in html5ever to trace its internal state.  This should be memory-safe even if arbitrary JavaScript can run during a parse.  Please let me know if you think of a reason it wouldn't be!

I think the likely outcome of a garbage collection during parsing is a dynamic `RefCell` borrow failure, but I'm going to look into that after this lands.  It should be safe to trace the parser while it's mutably borrowed, as long as it's not shared between threads, so we can probably switch to `UnsafeCell`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8d3b107568ab965b518b8003b702a5db993fa7d0

--HG--
rename : servo/tests/content/test_document_characterSet_long.html => servo/tests/content/test_document_characterSet_long.html.disabled
rename : servo/tests/content/test_document_characterSet_short.html => servo/tests/content/test_document_characterSet_short.html.disabled
2014-10-16 14:15:21 -06:00
Josh Matthews aa92247728 servo: Merge #3680 - Update rust-http to pick up latest additions (from jdm:updatehttp); r=jdm,metajack
Needed for #3596.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9cb2b3a5c0c13c9253d045990e5b30995b5909f5
2014-10-14 22:36:25 -06:00
Martin Robinson 3723af46a7 servo: Merge #3672 - Allow individual layers to render their own background color (from mrobinson:background-color); r=zwarich
Instead of relying on a scene-wide background color, all layers can now
have their own background color.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0487671dabf03949a6816d436f4f3c6423a30395
2014-10-14 21:27:26 -06:00
Matt Brubeck 09b8582693 servo: Merge #3563 - Move windowing code out of compositor, take 2. r=larsberg (from mbrubeck:app2)
Source-Repo: https://github.com/servo/servo
Source-Revision: 205067f10bc412608827e9a314a760acfb2ae15e

--HG--
rename : servo/Cargo.lock => servo/ports/android/glut_app/Cargo.lock
rename : servo/components/compositing/platform/common/glut_windowing.rs => servo/ports/android/glut_app/window.rs
rename : servo/components/compositing/platform/common/glfw_windowing.rs => servo/ports/glfw/window.rs
2014-10-10 13:12:37 -07:00
Manish Goregaokar 3c4a81d56f servo: Merge #3626 - Allow passing a method, request body, and headers to the pipeline in LoadUrlMsg (from Manishearth:form-prep); r=jdm
Framework for form submission

Source-Repo: https://github.com/servo/servo
Source-Revision: 2f9808e1306a6468dea0de8657a4fa5868e1a126
2014-10-09 16:00:34 -06:00
Clark Gaebel e1fa32f008 servo: Merge #3590 - Incremental Style Recalc (from cgaebel:slow-incremental-reflow-rebase); r=pcwalton
This patch puts in the initial framework for incremental reflow. Nodes' styles
are no longer recalculated unless the node has changed.

I've been hacking on the general problem of incremental reflow for the past
couple weeks, and I've yet to get a full implementation that actually passes all
the reftests + wikipedia + cnn. Therefore, I'm going to try to land the different
parts of it one by one.

This patch only does incremental style recalc, without incremental flow
construction, inline-size bubbling, reflow, or display lists. Those will be coming
in that order as I finish them.

At least with this strategy, I can land a working version of incremental reflow,
even if not yet complete.

r? @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 85b277655f07db1cb99c4d3dee93804735ed0470
2014-10-09 11:21:32 -06:00
Martin Robinson 7809f0a80f servo: Merge #3537 - Use LayerPixel for Layer bounds and most arguments (from mrobinson:scale); r=zwarich
When interacting with Layers it is simpler to use LayerPixels, which
are unscaled pixels in the Layer coordinate system. This removes a lot
of room for error and makes things simpler.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6358b7d94e14fc61348fd56bcd5c0ff50ae11156
2014-09-30 18:57:26 -06:00
Keegan McAllister 2e5e961694 servo: Merge #3530 - Use string-cache's Namespace type, backed by Atom (from kmcallister:namespace-atom); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 698b916c097ae0272a31a680cba7fc6dbd03ca3d
2014-09-30 02:42:23 -06:00
Glenn Watson 7732ccd2ac servo: Merge #3529 - Enable acid2 reftest on Linux. Update rust-layers (from glennw:linux-acid2); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: eec2225716daf7515b07456c290cf2ac0f8ae283
2014-09-29 23:09:24 -06:00
Matt Brubeck bce5f7089e servo: Merge #3525 - Pass a viewport to the rendering code (from mbrubeck:viewport); r=zwarich
Updates to the latest rust-layers and rust-geom to pick up
servo/rust-layers#114.  r? @zwarich

Source-Repo: https://github.com/servo/servo
Source-Revision: 01b4100756ec0ae1ff61d0bee5ea065396bed855
2014-09-29 17:03:26 -06:00
Simon Sapin 2a5f4c7376 servo: Merge #3487 - Upgrade Rust and enable style crate rustdoc (from servo:rustup-20140923); r=Ms2ger
The biggest language change is that enum variants now also reserve (for future use) a name in the type namespace, which must not collide with other types. Some things were renamed, and others qualified as `module::name`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7409685589c550ee7a9f94182f511acddab4c6fd
2014-09-29 10:45:27 -06:00
Martin Robinson 534c4dbfd4 servo: Merge #3464 - Allow iframes to scroll their contents (from mrobinson:scroll_offset)
Source-Repo: https://github.com/servo/servo
Source-Revision: 0951936abbe4ee4c71b76c14fe073d09236f89fc
2014-09-25 08:41:51 -07:00
Lars Bergstrom a5455db3ed servo: Merge #3473 - Disable travis (from servo:disable_travis)
Reviewed-by: SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 8668e67a6b84689da3b93d0a39dbdb7ae89729fa
2014-09-24 22:13:53 -06:00
Manish Goregaokar 8841e8f725 servo: Merge #3435 - Reorganize macros crate; r=jdm (from Manishearth:macro_reorg)
Source-Repo: https://github.com/servo/servo
Source-Revision: 27f3bcd7183d836bd454e687706b4e76d6d3b312

--HG--
rename : servo/components/macros/Cargo.toml => servo/components/plugins/Cargo.toml
rename : servo/components/macros/lib.rs => servo/components/plugins/lints.rs
2014-09-23 17:54:37 +05:01
Simon Sapin 54289aa22b servo: Merge #3437 - Use HTTPS for Cargo dependencies (from SimonSapin:https-deps)
Source-Repo: https://github.com/servo/servo
Source-Revision: c228b81ca8e851b3fd4e161ea83fc1d0913d516d
2014-09-21 11:00:34 +01:00
Simon Sapin e9f1c0bcd3 servo: Merge #3438 - Upgrade Rust (from servo:rustup)
Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c
2014-09-20 15:35:08 -07:00
Josh Matthews d3fc0a6b43 servo: Merge #3172 - Dump initial prototype of devtools server into the build. Expect lies if (from jdm:devtools)
Source-Repo: https://github.com/servo/servo
Source-Revision: b82c0dced08ccda8c3c7f35643c3891bc45b058c
2014-09-19 09:15:03 -04:00