Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Made fixes for PR.

Browse source
This commit is contained in:
Arthur Marble 2016-09-18 07:12:39 -05:00
parent 7986423cd7
commit b874e76455
12 changed files with 108 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/browsingcontext.rs
View file

@ -230,7 +230,7 @@ impl SessionHistoryEntry {
}
#[allow(unsafe_code)]
unsafe fn get_subframe_window(cx: *mut JSContext,
unsafe fn getSubframeWindow(cx: *mut JSContext,
proxy: HandleObject,
id: HandleId)
-> Option<Root<Window>> {
@ -239,7 +239,7 @@ unsafe fn get_subframe_window(cx: *mut JSContext,
rooted!(in(cx) let target = GetProxyPrivate(*proxy.ptr).to_object());
let win = root_from_handleobject::<Window>(target.handle()).unwrap();
let mut found = false;
return win.indexed_getter(index, &mut found);
return win.IndexedGetter(index, &mut found);
}
None
@ -251,7 +251,7 @@ unsafe extern "C" fn getOwnPropertyDescriptor(cx: *mut JSContext,
id: HandleId,
mut desc: MutableHandle<PropertyDescriptor>)
-> bool {
let window = get_subframe_window(cx, proxy, id);
let window = getSubframeWindow(cx, proxy, id);
if let Some(window) = window {
rooted!(in(cx) let mut val = UndefinedValue());
window.to_jsval(cx, val.handle_mut());
@ -300,7 +300,7 @@ unsafe extern "C" fn has(cx: *mut JSContext,
id: HandleId,
bp: *mut bool)
-> bool {
let window = get_subframe_window(cx, proxy, id);
let window = getSubframeWindow(cx, proxy, id);
if window.is_some() {
*bp = true;
return true;
@ -323,7 +323,7 @@ unsafe extern "C" fn get(cx: *mut JSContext,
id: HandleId,
vp: MutableHandleValue)
-> bool {
let window = get_subframe_window(cx, proxy, id);
let window = getSubframeWindow(cx, proxy, id);
if let Some(window) = window {
window.to_jsval(cx, vp);
return true;