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

21 Коммитов

Автор SHA1 Сообщение Дата
Simon Sapin cf8e6df581 servo: Merge #14644 - Ever so slightly less unstable (from servo:ever-so-slightly-less-unstable); r=heycam
<!-- 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
- [ ] These changes do not require tests because _____

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

Source-Repo: https://github.com/servo/servo
Source-Revision: e13f0017931e7f87cad13a13e3fe4e9bcbb9c554
2016-12-19 22:09:02 -08:00
Lars Bergstrom c6abe8b404 servo: Merge #14629 - Revert "Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15)." (from larsbergstrom:revert_rustup); r=nox
This reverts commit 5618e797683e7bfc400e8b1879d89f64bfb577fa.

<!-- Please describe your changes on the following line: -->
According to @nox, this breaks MacOS. Should be fine tomorrow:
rust-lang/rust#38430

r? @nox @Ms2ger (or whomever)

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

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

Source-Repo: https://github.com/servo/servo
Source-Revision: d918c1424783dedb8bb7f9dcbba00b8fcc0b0254
2016-12-19 06:33:09 -08:00
Ms2ger 27996b5590 servo: Merge #14481 - Update Rust to 1.15.0-nightly (8f02c429a 2016-12-15) (from servo:rustup); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 077a54de19ad6336cc6fae5fb4d9897535f67c2b
2016-12-19 03:58:56 -08:00
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
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
Johann Tuffe 5c3a5a67f5 servo: Merge #7265 - Add alphabetical order check for use statements (from tafia:tidy-use); r=Ms2ger
close #7112

Source-Repo: https://github.com/servo/servo
Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
2015-08-20 07:43:56 -06:00
Ms2ger 418336ea22 servo: Merge #6484 - Stop using deprecated boxed::into_raw in cef (from Ms2ger:raw-cef); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: ff979441210dd2f7037b565866446e755b5f3e24
2015-06-26 17:50:42 -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
Mike Blumenkrantz 6cb20728b5 servo: Merge #6219 - Favicon support: way more work than anyone expected or considered (from zmike:favicons_and_stringlOWWW-MY-HEAD); r=pcwalton
Getting these down to the embedding API level required that I redo the bindings generator again, so this is more commits than anticipated.

@mbrubeck @Manishearth @pcwalton but NOT @larsbergstrom so don't even look at this.

Source-Repo: https://github.com/servo/servo
Source-Revision: b0f3417cffb211d547853b8069e7a444a1d9964f
2015-06-03 00:27:41 -05:00
Mike Blumenkrantz 2dc4375f93 servo: Merge #6175 - Embedding: revenge of cargo (from zmike:embedding-REVENGE_OF_CARGO); r=larsbergstrom
Adds a bunch more embedding interfaces/callbacks/functionality

@larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 94ebfe81e454ca6dd68210b4475b4091e836dd1a
2015-05-27 14:17:32 -05:00
Mike Blumenkrantz b31ab650b7 servo: Merge #5955 - Embedding rebase rage (from zmike:embedding-REBASE_RAGE); r=larsbergstrom
This updates all the CEF interface stuff to the current CEF codebase.

Source-Repo: https://github.com/servo/servo
Source-Revision: 92f46e3149df7de59aa5aa6700c1878958e2f273

--HG--
rename : servo/ports/cef/interfaces/cef_url.rs => servo/ports/cef/interfaces/cef_parser.rs
2015-05-07 14:10:29 -05:00
Simon Sapin 95c8716656 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Ms2ger ab055a7596 servo: Merge #5661 - Stop using int/uint in CEF (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c42c2ae9b57b5960ce617e5b4c0ab75959e46957
2015-04-13 09:17:44 -05:00
Ms2ger 4e3e099b14 servo: Merge #5570 - Cleanup cef/wrappers.rs (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 37b67388846649da194bee653fa271963a9ee590
2015-04-08 15:04:20 -05:00
Ms2ger 58cb86389f servo: Merge #5317 - Fix some warnings in the CEF port (from Ms2ger:cef); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 092a6d6f10216470c118e0efbb1ce969ce2864a3
2015-03-23 04:15:50 -06:00
hgentry f27db51a13 servo: Merge #4890 - Remove our copy of Utf16Encoder in favor of the built-in equivalent (fixes #4725) (from servo:Utf16Encoder); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 395323cd70cad05f43617e9ef95f4db71df05d71
2015-02-12 09:18:46 -07:00
Ms2ger 39a22519e3 servo: Merge #4756 - Fix various build warnings (from Ms2ger:warnings); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 88b781421aa78a2f466e6d170f89d13a870643cd
2015-01-28 13:15:53 -07:00
Josh Matthews 78741af324 servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Patrick Walton 8b6e74fa78 servo: Merge #4193 - ports/cef: Implement accelerated compositing for the CEF port (from pcwalton:cef-redux); r=pcwalton,metajack
@glennw, is it possible to rebase your stuff on top of this? Sorry for the mess.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: ba06d50e3a611d1c27c6c9aa0b21441282911c3f
2014-12-10 09:40:03 -07:00
Patrick Walton 4b99bc08fd servo: Merge #4136 - ports/cef: Replace calls to malloc with calloc (from pcwalton:cef-calloc); r=metajack
r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 791606bde79cf38ae8484882a7986a1f258957a4
2014-12-02 14:39:51 -07:00
Patrick Walton 860ec5ac31 servo: Merge #4102 - ports/cef: Use the CEF translator tool to generate the full set of CEF bindings (from pcwalton:cef-autogeneration); r=larsbergstrom
This replaces hand-implemented CEF bindings with proper Rust wrappers
automatically generated from the C++ headers. This means that, whenever
CEF's C++ headers change, we can easily generate both the appropriate C
API and the appropriate Rust API. It eliminates much of the hand-written
unsafe code within the CEF port, because the CEF translator tool now
knows how to generate Rust smart pointer wrappers for each class that
corrently perform reference counting.

Additionally, this commit adds utility macros (located in `macros.rs`)
that make it easier to correctly expose Rust objects as CEF objects.
They handle the marshaling of objects between Rust and CEF properly.
The net result of this is that you can write mostly-natural-looking Rust
in the CEF port and interact with it with a natural-looking C++ API on
the embedding side.

This setup relies on the branch of CEF located here:

    https://github.com/pcwalton/chromium-embedded-framework

To regenerate, follow the instructions in `ports/cef/README.md`. For
convenience, and because I don't anticipate the API to change much, I
have vendored in all of the appropriate interfaces.

r? @zmike or @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 02c2f53ccd8b75ff0b87edfce4f2f9315a6417bd
2014-11-27 23:18:44 -07:00