Skip to content

Commit

Permalink
Made fixes for PR.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bubbles231
bubbles231 committed Sep 18, 2016
1 parent 7986423 commit b874e76
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 108 deletions.
10 changes: 5 additions & 5 deletions components/script/dom/browsingcontext.rs
View file
Expand Up @@ -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>> {
Expand All @@ -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
Expand All @@ -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());
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions components/script/dom/dompoint.rs
View file
Expand Up @@ -49,7 +49,7 @@ impl DOMPointMethods for DOMPoint {

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x
fn SetX(&self, value: f64) {
self.point.set_x(value);
self.point.SetX(value);
}

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y
Expand All @@ -59,7 +59,7 @@ impl DOMPointMethods for DOMPoint {

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y
fn SetY(&self, value: f64) {
self.point.set_y(value);
self.point.SetY(value);
}

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z
Expand All @@ -69,7 +69,7 @@ impl DOMPointMethods for DOMPoint {

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z
fn SetZ(&self, value: f64) {
self.point.set_z(value);
self.point.SetZ(value);
}

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w
Expand All @@ -79,6 +79,6 @@ impl DOMPointMethods for DOMPoint {

// https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w
fn SetW(&self, value: f64) {
self.point.set_w(value);
self.point.SetW(value);
}
}
16 changes: 8 additions & 8 deletions components/script/dom/dompointreadonly.rs
View file
Expand Up @@ -69,26 +69,26 @@ impl DOMPointReadOnlyMethods for DOMPointReadOnly {
}

pub trait DOMPointWriteMethods {
fn set_x(&self, value: f64);
fn set_y(&self, value: f64);
fn set_z(&self, value: f64);
fn set_w(&self, value: f64);
fn SetX(&self, value: f64);
fn SetY(&self, value: f64);
fn SetZ(&self, value: f64);
fn SetW(&self, value: f64);
}

impl DOMPointWriteMethods for DOMPointReadOnly {
fn set_x(&self, value: f64) {
fn SetX(&self, value: f64) {
self.x.set(value);
}

fn set_y(&self, value: f64) {
fn SetY(&self, value: f64) {
self.y.set(value);
}

fn set_z(&self, value: f64) {
fn SetZ(&self, value: f64) {
self.z.set(value);
}

fn set_w(&self, value: f64) {
fn SetW(&self, value: f64) {
self.w.set(value);
}
}
36 changes: 18 additions & 18 deletions components/script/dom/htmlanchorelement.rs
View file
Expand Up @@ -157,7 +157,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => USVString(String::new()),
Some(ref url) => {
// Steps 3-4.
UrlHelper::hash(url)
UrlHelper::Hash(url)
}
}
}
Expand All @@ -174,7 +174,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Steps 4-5.
Some(url) => {
UrlHelper::set_hash(url, value);
UrlHelper::SetHash(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -195,7 +195,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
USVString(String::new())
} else {
// Steps 4-5.
UrlHelper::host(url)
UrlHelper::Host(url)
}
}
}
Expand All @@ -213,7 +213,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 4.
Some(url) => {
UrlHelper::set_host(url, value);
UrlHelper::SetHost(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -231,7 +231,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => USVString(String::new()),
Some(ref url) => {
// Step 4.
UrlHelper::hostname(url)
UrlHelper::Hostname(url)
}
}
}
Expand All @@ -248,7 +248,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 4.
Some(url) => {
UrlHelper::set_hostname(url, value);
UrlHelper::SetHostname(url, value);
DOMString::from(url.as_str())
}
};
Expand Down Expand Up @@ -291,7 +291,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 3.
None => USVString(String::new()),
// Steps 3-4.
Some(ref url) => UrlHelper::password(url)
Some(ref url) => UrlHelper::Password(url)
}
}

Expand All @@ -307,7 +307,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 4.
Some(url) => {
UrlHelper::set_password(url, value);
UrlHelper::SetPassword(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -324,7 +324,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 3.
None => USVString(String::new()),
// Steps 4-5.
Some(ref url) => UrlHelper::pathname(url)
Some(ref url) => UrlHelper::Pathname(url)
}
}

Expand All @@ -340,7 +340,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 5.
Some(url) => {
UrlHelper::set_pathname(url, value);
UrlHelper::SetPathname(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -357,7 +357,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 3.
None => USVString(String::new()),
// Step 4.
Some(ref url) => UrlHelper::port(url)
Some(ref url) => UrlHelper::Port(url)
}
}

Expand All @@ -374,7 +374,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 4.
Some(url) => {
UrlHelper::set_port(url, value);
UrlHelper::SetPort(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -391,7 +391,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 2.
None => USVString(":".to_owned()),
// Step 3.
Some(ref url) => UrlHelper::protocol(url)
Some(ref url) => UrlHelper::Protocol(url)
}
}

Expand All @@ -405,7 +405,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 3.
Some(url) => {
UrlHelper::set_protocol(url, value);
UrlHelper::SetProtocol(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -422,7 +422,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 2.
None => USVString(String::new()),
// Step 3.
Some(ref url) => UrlHelper::search(url)
Some(ref url) => UrlHelper::Search(url)
}
}

Expand All @@ -439,7 +439,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// TODO add this element's node document character encoding as
// encoding override (as described in the spec)
Some(url) => {
UrlHelper::set_search(url, value);
UrlHelper::SetSearch(url, value);
DOMString::from(url.as_str())
}
};
Expand All @@ -456,7 +456,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 2.
None => USVString(String::new()),
// Step 3.
Some(ref url) => UrlHelper::username(url)
Some(ref url) => UrlHelper::Username(url)
}
}

Expand All @@ -472,7 +472,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
None => return,
// Step 4.
Some(url) => {
UrlHelper::set_username(url, value);
UrlHelper::SetUsername(url, value);
DOMString::from(url.as_str())
}
};
Expand Down
10 changes: 5 additions & 5 deletions components/script/dom/htmliframeelement.rs
View file
Expand Up @@ -402,7 +402,7 @@ unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent,
}
}

pub fn navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult {
pub fn Navigate(iframe: &HTMLIFrameElement, direction: TraversalDirection) -> ErrorResult {
if iframe.Mozbrowser() {
if iframe.upcast::<Node>().is_in_doc() {
let window = window_from_node(iframe);
Expand Down Expand Up @@ -450,7 +450,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
let self_url = self.get_url();
let win_url = window_from_node(self).get_url();

if UrlHelper::same_origin(&self_url, &win_url) {
if UrlHelper::SameOrigin(&self_url, &win_url) {
Some(window.Document())
} else {
None
Expand Down Expand Up @@ -479,12 +479,12 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {

// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goBack
fn GoBack(&self) -> ErrorResult {
navigate(self, TraversalDirection::Back(1))
Navigate(self, TraversalDirection::Back(1))
}

// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goForward
fn GoForward(&self) -> ErrorResult {
navigate(self, TraversalDirection::Forward(1))
Navigate(self, TraversalDirection::Forward(1))
}

// https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload
Expand Down Expand Up @@ -632,7 +632,7 @@ impl VirtualMethods for HTMLIFrameElement {
// HTMLIFrameElement::contentDocument.
let self_url = self.get_url();
let win_url = window_from_node(self).get_url();
UrlHelper::same_origin(&self_url, &win_url)
UrlHelper::SameOrigin(&self_url, &win_url)
};
let (sender, receiver) = if same_origin {
(None, None)
Expand Down

0 comments on commit b874e76

Please sign in to comment.