diff options
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 5 | ||||
-rw-r--r-- | components/script/dom/virtualmethods.rs | 9 | ||||
-rw-r--r-- | components/script/script_task.rs | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 0257f8edc2e..90145ca610e 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -23,7 +23,7 @@ use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource}; use script_task::StackRootTLS; use servo_net::resource_task::{ResourceTask, load_whole_resource}; -use servo_util::task::spawn_named_native; +use servo_util::task::spawn_named; use servo_util::task_state; use servo_util::task_state::{SCRIPT, IN_WORKER}; @@ -135,8 +135,7 @@ impl DedicatedWorkerGlobalScope { parent_sender: Box<ScriptChan+Send>, own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>, receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>) { - spawn_named_native(format!("WebWorker for {}", worker_url.serialize()), proc() { - + spawn_named(format!("WebWorker for {}", worker_url.serialize()), proc() { task_state::initialize(SCRIPT | IN_WORKER); let roots = RootCollection::new(); diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 57578d61dda..adbeb15c2ba 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -50,7 +50,7 @@ use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlselectelement::HTMLSelectElement; use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltableelement::HTMLTableElement; -use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementTypeId}; +use dom::htmltablecellelement::HTMLTableCellElement; use dom::htmltablerowelement::HTMLTableRowElement; use dom::htmltablesectionelement::HTMLTableSectionElement; use dom::htmltextareaelement::HTMLTextAreaElement; @@ -216,12 +216,7 @@ pub fn vtable_for<'a>(node: &'a JSRef<'a, Node>) -> &'a (VirtualMethods + 'a) { HTMLTableElementCast::to_borrowed_ref(node).unwrap(); element as &'a (VirtualMethods + 'a) } - NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLTableCellElement( - HTMLTableCellElementTypeId::HTMLTableDataCellElement))) | - NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLTableCellElement( - HTMLTableCellElementTypeId::HTMLTableHeaderCellElement))) => { + NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCellElement(_))) => { let element: &'a JSRef<'a, HTMLTableCellElement> = HTMLTableCellElementCast::to_borrowed_ref(node).unwrap(); element as &'a (VirtualMethods + 'a) diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 2b192c75587..88e6ed860a5 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -314,7 +314,7 @@ impl ScriptTaskFactory for ScriptTask { // This must always be the very last operation performed before the task completes failsafe.neuter(); - }, ConstellationMsg::Failure(failure_msg), const_chan, false); + }, ConstellationMsg::Failure(failure_msg), const_chan); } } |