aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-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
-rw-r--r--components/script/script_thread.rs6
-rw-r--r--components/script/webdriver_handlers.rs10
12 files changed, 21 insertions, 21 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)
};
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index a5452bc38ec..30462f3823b 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1239,7 +1239,7 @@ impl ScriptThread {
let mut reports = vec![];
for (_, document) in self.documents.borrow().iter() {
- let current_url = document.url().as_str();
+ let current_url = document.url();
for child in document.upcast::<Node>().traverse_preorder() {
dom_tree_size += heap_size_of_self_and_children(&*child);
@@ -1249,10 +1249,10 @@ impl ScriptThread {
if reports.len() > 0 {
path_seg.push_str(", ");
}
- path_seg.push_str(current_url);
+ path_seg.push_str(current_url.as_str());
reports.push(Report {
- path: path![format!("url({})", current_url), "dom-tree"],
+ path: path![format!("url({})", current_url.as_str()), "dom-tree"],
kind: ReportKind::ExplicitJemallocHeapSize,
size: dom_tree_size,
});
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index a0de437d02f..e0818347c56 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -195,7 +195,7 @@ pub fn handle_get_cookies(documents: &Documents,
let url = document.url();
let (sender, receiver) = ipc::channel().unwrap();
let _ = document.window().upcast::<GlobalScope>().resource_threads().send(
- GetCookiesDataForUrl(url.clone(), sender, NonHTTP)
+ GetCookiesDataForUrl(url, sender, NonHTTP)
);
receiver.recv().unwrap()
},
@@ -215,7 +215,7 @@ pub fn handle_get_cookie(documents: &Documents,
let url = document.url();
let (sender, receiver) = ipc::channel().unwrap();
let _ = document.window().upcast::<GlobalScope>().resource_threads().send(
- GetCookiesDataForUrl(url.clone(), sender, NonHTTP)
+ GetCookiesDataForUrl(url, sender, NonHTTP)
);
receiver.recv().unwrap()
},
@@ -243,13 +243,13 @@ pub fn handle_add_cookie(documents: &Documents,
(true, _) => Err(WebDriverCookieError::InvalidDomain),
(false, Some(ref domain)) if url.host_str().map(|x| { x == &**domain }).unwrap_or(false) => {
let _ = document.window().upcast::<GlobalScope>().resource_threads().send(
- SetCookiesForUrlWithData(url.clone(), cookie, method)
+ SetCookiesForUrlWithData(url, cookie, method)
);
Ok(())
},
(false, None) => {
let _ = document.window().upcast::<GlobalScope>().resource_threads().send(
- SetCookiesForUrlWithData(url.clone(), cookie, method)
+ SetCookiesForUrlWithData(url, cookie, method)
);
Ok(())
},
@@ -364,7 +364,7 @@ pub fn handle_get_url(documents: &Documents,
reply: IpcSender<ServoUrl>) {
// TODO: Return an error if the pipeline doesn't exist.
let url = documents.find_document(pipeline)
- .map(|document| document.url().clone())
+ .map(|document| document.url())
.unwrap_or_else(|| ServoUrl::parse("about:blank").expect("infallible"));
reply.send(url).unwrap();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 10:53:27 +0000