diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
| commit | 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2 (patch) | |
| tree | cc36210329cb1a31709a03685c05c4aaa99407e3 /components/script/dom/bindings/utils.rs | |
| parent | 65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff) | |
| parent | 5f15eb5fbfb7a8649132cc8b3a07314389836714 (diff) | |
| download | servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.tar.gz servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.zip | |
auto merge of #5256 : servo/servo/rustup_20150311, r=jdm
...v.
Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
| -rw-r--r-- | components/script/dom/bindings/utils.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 67a06b21a48..c24c6110821 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -577,7 +577,10 @@ pub extern fn outerize_global(_cx: *mut JSContext, obj: JSHandleObject) -> *mut debug!("outerizing"); let obj = *obj.unnamed_field1; let win: Root<window::Window> = native_from_reflector_jsmanaged(obj).unwrap().root(); - win.r().browser_context().as_ref().unwrap().window_proxy() + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let win = win.r(); + let context = win.browser_context(); + context.as_ref().unwrap().window_proxy() } } |