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

Remove unused recycle argument from Document::unload

Browse source
This commit is contained in:
George Roman 2018-11-30 17:10:25 +02:00
parent be206f3e5f
commit 6c458b04d2
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/document.rs
View file

@ -1824,7 +1824,7 @@ impl Document {
} }
// https://html.spec.whatwg.org/multipage/#unload-a-document // https://html.spec.whatwg.org/multipage/#unload-a-document
pub fn unload(&self, recursive_flag: bool, recycle: bool) { pub fn unload(&self, recursive_flag: bool) {
// TODO: Step 1, increase the event loop's termination nesting level by 1. // TODO: Step 1, increase the event loop's termination nesting level by 1.
// Step 2 // Step 2
self.incr_ignore_opens_during_unload_counter(); self.incr_ignore_opens_during_unload_counter();
@ -1872,7 +1872,7 @@ impl Document {
for iframe in self.iter_iframes() { for iframe in self.iter_iframes() {
// TODO: handle the case of cross origin iframes. // TODO: handle the case of cross origin iframes.
let document = document_from_node(&*iframe); let document = document_from_node(&*iframe);
document.unload(true, recycle); document.unload(true);
if !document.salvageable() { if !document.salvageable() {
self.salvageable.set(false); self.salvageable.set(false);
} }

2
components/script/dom/window.rs
View file

@ -604,7 +604,7 @@ impl WindowMethods for Window {
// Step 1, prompt to unload. // Step 1, prompt to unload.
if doc.prompt_to_unload(false) { if doc.prompt_to_unload(false) {
// Step 2, unload. // Step 2, unload.
doc.unload(false, false); doc.unload(false);
// Step 3, remove from the user interface // Step 3, remove from the user interface
let _ = self.send_to_embedder(EmbedderMsg::CloseBrowser); let _ = self.send_to_embedder(EmbedderMsg::CloseBrowser);
// Step 4, discard browsing context. // Step 4, discard browsing context.

2
components/script/script_thread.rs
View file

@ -2083,7 +2083,7 @@ impl ScriptThread {
fn handle_unload_document(&self, pipeline_id: PipelineId) { fn handle_unload_document(&self, pipeline_id: PipelineId) {
let document = self.documents.borrow().find_document(pipeline_id); let document = self.documents.borrow().find_document(pipeline_id);
if let Some(document) = document { if let Some(document) = document {
document.unload(false, false); document.unload(false);
} }
} }