ran ./mach fmt

- removed unused import in document_loader.rs
- limit unsafe block in mark_document_with_no_blocked_loads in script_thread.rs
- changed name of if let value to load in Drop for LoadBlocker in document_loader.rs
This commit is contained in:
elias 2019-03-13 11:39:14 -05:00
parent c713febe7a
commit be82d7c905
2 changed files with 5 additions and 6 deletions

View file

@ -14,7 +14,6 @@ use net_traits::request::RequestInit;
use net_traits::{CoreResourceMsg, FetchChannels, FetchResponseMsg};
use net_traits::{IpcSend, ResourceThreads};
use servo_url::ServoUrl;
use std::thread;
#[derive(Clone, Debug, JSTraceable, MallocSizeOf, PartialEq)]
pub enum LoadType {
@ -77,8 +76,8 @@ impl LoadBlocker {
impl Drop for LoadBlocker {
fn drop(&mut self) {
if let Some(script_thread) = self.load.take() {
self.doc.finish_load(script_thread);
if let Some(load) = self.load.take() {
self.doc.finish_load(load);
}
}
}

View file

@ -809,13 +809,13 @@ impl ScriptThread {
pub fn mark_document_with_no_blocked_loads(doc: &Document) {
SCRIPT_THREAD_ROOT.with(|root| {
unsafe {
if let Some(script_thread) = root.get() {
(*script_thread)
let script_thread = unsafe { &*script_thread };
script_thread
.docs_with_no_blocking_loads
.borrow_mut()
.insert(Dom::from_ref(doc));
}}
}
})
}