auto merge of #5202 : doublec/servo/rename_unwrap, r=Ms2ger

Fix for issue #2108. That issue mentions an `unwrap_object` which doesn't seem to exist so I renamed `unwrap` to `native_from_reflector` and `unwrap_jsmanaged` to `native_from_reflector_jsmanaged`. The latter is a bit unweildy - maybe a shorter name might be better?

1 files changed, 2 insertions, 2 deletions

diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index a3af0a8b02a..d4b2591f247 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::conversions::unwrap_jsmanaged;
+use dom::bindings::conversions::native_from_reflector_jsmanaged;
 use dom::bindings::conversions::{ToJSValConvertible};
 use dom::bindings::js::{JS, JSRef, Temporary, Root};
 use dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable};
@@ -108,7 +108,7 @@ unsafe fn GetSubframeWindow(cx: *mut JSContext, proxy: *mut JSObject, id: jsid)
     let index = get_array_index_from_id(cx, id);
     if let Some(index) = index {
         let target = GetProxyPrivate(proxy).to_object();
-        let win: Root<Window> = unwrap_jsmanaged(target).unwrap().root();
+        let win: Root<Window> = native_from_reflector_jsmanaged(target).unwrap().root();
         let mut found = false;
         return win.r().IndexedGetter(index, &mut found);
     }