aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorPu Xingyu <pu.stshine@gmail.com>2016-11-18 12:39:22 +0800
committerPu Xingyu <pu.stshine@gmail.com>2016-11-18 12:39:22 +0800
commit91f3d4f4749a1dd53d665f741be85559b820cbe7 (patch)
tree0170b480610acde6aa39867bdf581c4d6d352022 /components/script/dom
parentfb6cc15208690acb4c66445b71f2ff8d1dcfcf73 (diff)
downloadservo-91f3d4f4749a1dd53d665f741be85559b820cbe7.tar.gz
servo-91f3d4f4749a1dd53d665f741be85559b820cbe7.zip
Remove redundant url clones
They are now redundant since now document.url() returns a struct rather than a reference.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/htmlanchorelement.rs2
-rw-r--r--components/script/dom/htmlformelement.rs2
-rw-r--r--components/script/dom/htmliframeelement.rs2
-rw-r--r--components/script/dom/htmllinkelement.rs4
-rw-r--r--components/script/dom/htmlmediaelement.rs4
-rw-r--r--components/script/dom/htmlscriptelement.rs4
-rw-r--r--components/script/dom/macros.rs2
-rw-r--r--components/script/dom/node.rs2
-rw-r--r--components/script/dom/window.rs2
-rw-r--r--components/script/dom/xmlhttprequest.rs2
10 files changed, 13 insertions, 13 deletions
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
index a983c75bf91..f92290b2c97 100644
--- a/components/script/dom/htmlanchorelement.rs
+++ b/components/script/dom/htmlanchorelement.rs
@@ -615,5 +615,5 @@ fn follow_hyperlink(subject: &Element, hyperlink_suffix: Option<String>, referre
debug!("following hyperlink to {}", url);
let window = document.window();
- window.load_url(url, false, referrer_policy);
+ window.load_url(url, false, false, referrer_policy);
}
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index cbf32ef9aab..1af3914db2c 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -341,7 +341,7 @@ impl HTMLFormElement {
let _target = submitter.target();
// TODO: Handle browsing contexts, partially loaded documents (step 16-17)
- let mut load_data = LoadData::new(action_components, doc.get_referrer_policy(), Some(doc.url().clone()));
+ let mut load_data = LoadData::new(action_components, doc.get_referrer_policy(), Some(doc.url()));
// Step 18
match (&*scheme, method) {
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 311cc80aa8c..a31baa9f045 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -157,7 +157,7 @@ impl HTMLIFrameElement {
let document = document_from_node(self);
self.navigate_or_reload_child_browsing_context(
- Some(LoadData::new(url, document.get_referrer_policy(), Some(document.url().clone()))), false);
+ Some(LoadData::new(url, document.get_referrer_policy(), Some(document.url()))), false);
}
#[allow(unsafe_code)]
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index f670d8757e3..26abee87b52 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -280,9 +280,9 @@ impl HTMLLinkElement {
destination: Destination::Style,
credentials_mode: CredentialsMode::Include,
use_url_credentials: true,
- origin: document.url().clone(),
+ origin: document.url(),
pipeline_id: Some(self.global().pipeline_id()),
- referrer_url: Some(document.url().clone()),
+ referrer_url: Some(document.url()),
referrer_policy: referrer_policy,
.. RequestInit::default()
};
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index b1480391223..4d68edf3584 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -548,9 +548,9 @@ impl HTMLMediaElement {
destination: Destination::Media,
credentials_mode: CredentialsMode::Include,
use_url_credentials: true,
- origin: document.url().clone(),
+ origin: document.url(),
pipeline_id: Some(self.global().pipeline_id()),
- referrer_url: Some(document.url().clone()),
+ referrer_url: Some(document.url()),
referrer_policy: document.get_referrer_policy(),
.. RequestInit::default()
};
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 50c7658daab..62e3cf68a86 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -241,9 +241,9 @@ fn fetch_a_classic_script(script: &HTMLScriptElement,
Some(CorsSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin,
_ => CredentialsMode::Include,
},
- origin: doc.url().clone(),
+ origin: doc.url(),
pipeline_id: Some(script.global().pipeline_id()),
- referrer_url: Some(doc.url().clone()),
+ referrer_url: Some(doc.url()),
referrer_policy: doc.get_referrer_policy(),
.. RequestInit::default()
};
diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs
index 82800be2ff2..53c5bd20115 100644
--- a/components/script/dom/macros.rs
+++ b/components/script/dom/macros.rs
@@ -135,7 +135,7 @@ macro_rules! make_string_or_document_url_getter(
if val.is_empty() {
let doc = document_from_node(self);
- DOMString::from(doc.url().clone().into_string())
+ DOMString::from(doc.url().into_string())
} else {
val
}
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 8d009bc2f98..883a87a3f16 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1751,7 +1751,7 @@ impl Node {
let window = document.window();
let loader = DocumentLoader::new(&*document.loader());
let document = Document::new(window, None,
- Some((*document.url()).clone()),
+ Some(document.url()),
is_html_doc, None,
None, DocumentSource::NotFromParser, loader,
None, None);
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 64e06bf8811..f2c7e48fbde 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1366,7 +1366,7 @@ impl Window {
}
pub fn get_url(&self) -> ServoUrl {
- (*self.Document().url()).clone()
+ self.Document().url()
}
pub fn layout_chan(&self) -> &Sender<Msg> {
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index e9d440ffed9..493e99cc957 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -159,7 +159,7 @@ impl XMLHttpRequest {
//TODO - update this when referrer policy implemented for workers
let (referrer_url, referrer_policy) = if let Some(window) = global.downcast::<Window>() {
let document = window.Document();
- (Some(document.url().clone()), document.get_referrer_policy())
+ (Some(document.url()), document.get_referrer_policy())
} else {
(None, None)
};