Auto merge of #5995 - zmike:glutin-parenting, r=jdm

needed for embedding api usage

Depends on https://github.com/servo/glutin/pull/20

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5995)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-13 15:27:47 -05:00
commit a388a76d82
6 changed files with 11 additions and 8 deletions

View file

@ -430,7 +430,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.26"
source = "git+https://github.com/servo/glutin?branch=servo#11389c9ead188376095297a5a295f53d98129a57"
source = "git+https://github.com/servo/glutin?branch=servo#b28f35aa5b06e7d34ada307a5a1b1e9b9de697a1"
dependencies = [
"android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -53,7 +53,7 @@ fn main() {
let window = if opts::get().headless {
None
} else {
Some(app::create_window())
Some(app::create_window(std::ptr::null_mut()))
};
// Our wrapper around `Browser` that also implements some