Warning

• These commits modify layout code, but no reftests are modified. Please consider adding a reftest!

@bors-servo r+

Note: The extra version of glutin was added because of servo/surfman#30 but is only used on Windows currently, and I don't think it'll cause any conflicts even there. Long-term, we should move Servo back to upstream glutin...

📌 Commit 184b2ba has been approved by mbrubeck

⌛ Testing commit 184b2ba with merge 0d699a2...

The other question I had was about cocoa on gonk.

Reviewed 24 of 24 files at r1, 16 of 16 files at r2.
Review status: all files reviewed at latest revision, 2 unresolved discussions, some commit checks pending.

^{ports/gonk/Cargo.lock, line 215 [r1] (raw file):}
Why does gonk depend on cocoa??

^{ports/gonk/Cargo.lock, line 674 [r1] (raw file):}
This is a dupe dependency, here and elsewhere where it got added.

Comments from the review on Reviewable.io

Review status: all files reviewed at latest revision, 2 unresolved discussions, some commit checks pending.

^{ports/gonk/Cargo.lock, line 215 [r1] (raw file):}
Because glutin does. Lockfiles aren't concerned with platform deps.

^{ports/gonk/Cargo.lock, line 674 [r1] (raw file):}
This is because of rust-offscreen-rendering-context using the crates dep instead of our fork. As it should.

Comments from the review on Reviewable.io

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt

@mbrubeck It should be fixed in servo/surfman#33.
Sorry about that, I missed it on the review.