diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-07-15 22:28:43 +0200 |
| commit | d97ec6995773ee79fbde053520bc580e7b33d15d (patch) | |
| tree | e5a00cefa1309b80bc8a44287c3cc9059ed4a257 /src/components/script/dom/bindings/error.rs | |
| parent | f816a92c72e2eb60f733b2cd7072c8542710d5ae (diff) | |
| parent | df9d063b36aca184a336b9e67da3ce30bb46cb79 (diff) | |
| download | servo-d97ec6995773ee79fbde053520bc580e7b33d15d.tar.gz servo-d97ec6995773ee79fbde053520bc580e7b33d15d.zip | |
Merge pull request #2839 from Ms2ger/globals
Introduce abstractions for global scopes; r=Manishearth,larsberg
Diffstat (limited to 'src/components/script/dom/bindings/error.rs')
| -rw-r--r-- | src/components/script/dom/bindings/error.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/error.rs b/src/components/script/dom/bindings/error.rs index 7b021bbae2d..f204dc5859a 100644 --- a/src/components/script/dom/bindings/error.rs +++ b/src/components/script/dom/bindings/error.rs @@ -3,9 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::conversions::ToJSValConvertible; -use dom::bindings::js::JSRef; +use dom::bindings::global::GlobalRef; use dom::domexception::DOMException; -use dom::window::Window; use js::jsapi::{JSContext, JSBool}; use js::jsapi::{JS_IsExceptionPending, JS_SetPendingException}; @@ -37,7 +36,7 @@ pub type Fallible<T> = Result<T, Error>; pub type ErrorResult = Fallible<()>; -pub fn throw_dom_exception(cx: *mut JSContext, global: &JSRef<Window>, +pub fn throw_dom_exception(cx: *mut JSContext, global: &GlobalRef, result: Error) { assert!(unsafe { JS_IsExceptionPending(cx) } == 0); let exception = DOMException::new_from_error(global, result).root(); |