Introduce GlobalScope::report_an_error

1 files changed, 10 insertions, 11 deletions

diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs
index 7366d507649..9ff4ae047da 100644
--- a/components/script/dom/bindings/global.rs
+++ b/components/script/dom/bindings/global.rs
@@ -8,7 +8,7 @@
 //! code that works in workers as well as window scopes.
 
 use dom::bindings::conversions::root_from_object;
-use dom::bindings::error::{ErrorInfo, report_pending_exception};
+use dom::bindings::error::report_pending_exception;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::Root;
 use dom::bindings::reflector::{Reflectable, Reflector};
@@ -18,8 +18,8 @@ use dom::workerglobalscope::WorkerGlobalScope;
 use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL};
 use js::glue::{IsWrapper, UnwrapObject};
 use js::jsapi::{CurrentGlobalOrNull, Evaluate2, GetGlobalForObjectCrossCompartment};
-use js::jsapi::{HandleValue, JS_GetClass, JSAutoCompartment, JSContext};
-use js::jsapi::{JSObject, MutableHandleValue};
+use js::jsapi::{JSAutoCompartment, JSContext, JSObject};
+use js::jsapi::{JS_GetClass, MutableHandleValue};
 use js::rust::CompileOptionsWrapper;
 use libc;
 use net_traits::{CoreResourceThread, IpcSend, ResourceThreads};
@@ -220,14 +220,6 @@ impl<'a> GlobalRef<'a> {
             GlobalRef::Worker(ref worker) => worker.flush_promise_jobs(),
         }
     }
-
-    /// https://html.spec.whatwg.org/multipage/#report-the-error
-    pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
-        match *self {
-            GlobalRef::Window(ref window) => window.report_an_error(error_info, value),
-            GlobalRef::Worker(ref worker) => worker.report_an_error(error_info, value),
-        }
-    }
 }
 
 impl<'a> Reflectable for GlobalRef<'a> {
@@ -296,6 +288,13 @@ pub unsafe fn global_root_from_object(obj: *mut JSObject) -> GlobalRoot {
     global_root_from_global(global)
 }
 
+/// Returns the global scope for the given JSContext
+#[allow(unrooted_must_root)]
+pub unsafe fn global_scope_from_context(cx: *mut JSContext) -> Root<GlobalScope> {
+    let global = CurrentGlobalOrNull(cx);
+    global_scope_from_global(global)
+}
+
 /// Returns the global object for the given JSContext
 #[allow(unrooted_must_root)]
 pub unsafe fn global_root_from_context(cx: *mut JSContext) -> GlobalRoot {