From 59904e65d5b53fa2a458de19692cbe2a89875c5c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 5 Sep 2016 17:48:24 +0200 Subject: Remove dead error handling code. --- components/script/dom/serviceworker.rs | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'components/script/dom/serviceworker.rs') diff --git a/components/script/dom/serviceworker.rs b/components/script/dom/serviceworker.rs index 19af9b09ba4..2b79be43dc8 100644 --- a/components/script/dom/serviceworker.rs +++ b/components/script/dom/serviceworker.rs @@ -2,8 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use dom::abstractworker::WorkerScriptMsg; -use dom::abstractworker::{SimpleWorkerErrorHandler, WorkerErrorHandler}; +use dom::abstractworker::{SimpleWorkerErrorHandler, WorkerScriptMsg}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::ServiceWorkerBinding::{ServiceWorkerMethods, ServiceWorkerState, Wrap}; @@ -11,12 +10,9 @@ use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; use dom::bindings::js::Root; use dom::bindings::refcounted::Trusted; -use dom::bindings::reflector::{Reflectable, reflect_dom_object}; -use dom::bindings::str::{DOMString, USVString}; -use dom::errorevent::ErrorEvent; -use dom::event::{Event, EventBubbles, EventCancelable}; +use dom::bindings::reflector::reflect_dom_object; +use dom::bindings::str::USVString; use dom::eventtarget::EventTarget; -use js::jsval::UndefinedValue; use script_thread::Runnable; use std::cell::Cell; use std::sync::mpsc::Sender; @@ -66,18 +62,6 @@ impl ServiceWorker { Url::parse(&self.script_url.borrow().clone()).unwrap() } - pub fn handle_error_message(address: TrustedServiceWorkerAddress, message: DOMString, - filename: DOMString, lineno: u32, colno: u32) { - let worker = address.root(); - - let global = worker.r().global(); - rooted!(in(global.r().get_cx()) let error = UndefinedValue()); - let errorevent = ErrorEvent::new(global.r(), atom!("error"), - EventBubbles::Bubbles, EventCancelable::Cancelable, - message, filename, lineno, colno, error.handle()); - errorevent.upcast::().fire(worker.upcast()); - } - pub fn install_serviceworker(global: GlobalRef, script_url: Url, skip_waiting: bool) -> Root { @@ -112,11 +96,3 @@ impl Runnable for SimpleWorkerErrorHandler { ServiceWorker::dispatch_simple_error(this.addr); } } - -impl Runnable for WorkerErrorHandler { - #[allow(unrooted_must_root)] - fn handler(self: Box>) { - let this = *self; - ServiceWorker::handle_error_message(this.addr, this.msg, this.file_name, this.line_num, this.col_num); - } -} -- cgit v1.2.3