Call the generated rather than the hand-written traits (fixes #2936).

1 files changed, 1 insertions, 27 deletions

diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index e5f867c436b..e620a8c40b0 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -4,6 +4,7 @@
 
 use dom::bindings::codegen::Bindings::EventHandlerBinding::{OnErrorEventHandlerNonNull, EventHandlerNonNull};
 use dom::bindings::codegen::Bindings::WindowBinding;
+use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::codegen::InheritTypes::EventTargetCast;
 use dom::bindings::global;
 use dom::bindings::js::{JS, JSRef, Temporary, OptionalSettable};
@@ -119,33 +120,6 @@ pub struct TimerData {
     pub funval: Traceable<JSVal>,
 }
 
-pub trait WindowMethods {
-    fn Alert(&self, s: DOMString);
-    fn Close(&self);
-    fn Document(&self) -> Temporary<Document>;
-    fn Location(&self) -> Temporary<Location>;
-    fn Console(&self) -> Temporary<Console>;
-    fn Navigator(&self) -> Temporary<Navigator>;
-    fn SetTimeout(&self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32;
-    fn ClearTimeout(&self, handle: i32);
-    fn SetInterval(&self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32;
-    fn ClearInterval(&self, handle: i32);
-    fn Window(&self) -> Temporary<Window>;
-    fn Self(&self) -> Temporary<Window>;
-    fn Performance(&self) -> Temporary<Performance>;
-    fn GetOnclick(&self) -> Option<EventHandlerNonNull>;
-    fn SetOnclick(&self, listener: Option<EventHandlerNonNull>);
-    fn GetOnload(&self) -> Option<EventHandlerNonNull>;
-    fn SetOnload(&self, listener: Option<EventHandlerNonNull>);
-    fn GetOnunload(&self) -> Option<EventHandlerNonNull>;
-    fn SetOnunload(&self, listener: Option<EventHandlerNonNull>);
-    fn GetOnerror(&self) -> Option<OnErrorEventHandlerNonNull>;
-    fn SetOnerror(&self, listener: Option<OnErrorEventHandlerNonNull>);
-    fn Screen(&self) -> Temporary<Screen>;
-    fn Debug(&self, message: DOMString);
-    fn Gc(&self);
-}
-
 impl<'a> WindowMethods for JSRef<'a, Window> {
     fn Alert(&self, s: DOMString) {
         // Right now, just print to the console