aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorArthur Marble <arthur@info9.net>2016-09-18 07:12:39 -0500
committerArthur Marble <arthur@info9.net>2016-09-18 07:12:39 -0500
commitb874e764553b928db06e580498516558ebeb5d72 (patch)
tree74437d150395f0b72f39b4ae1b779844b9785863 /components/script/dom/htmliframeelement.rs
parent7986423cd7235eeff6da2c2395c6ecdef4fb78df (diff)
downloadservo-b874e764553b928db06e580498516558ebeb5d72.tar.gz
servo-b874e764553b928db06e580498516558ebeb5d72.zip
Made fixes for PR.
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 1671c933074..3b74d3e6e05 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -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);
@@ -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
@@ -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
@@ -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)