Skip to content

Commit

Permalink
Auto merge of #8491 - jdm:lazycompile, r=Ms2ger
Browse files Browse the repository at this point in the history
  • Loading branch information
bors-servo committed Feb 11, 2016
2 parents 3703e6d + 2796a4d commit 5942e9e
Show file tree
Hide file tree
Showing 11 changed files with 323 additions and 67 deletions.
9 changes: 9 additions & 0 deletions components/script/dom/bindings/trace.rs
Expand Up @@ -255,6 +255,15 @@ impl<A: JSTraceable, B: JSTraceable> JSTraceable for (A, B) {
}
}

impl<A: JSTraceable, B: JSTraceable, C: JSTraceable> JSTraceable for (A, B, C) {
#[inline]
fn trace(&self, trc: *mut JSTracer) {
let (ref a, ref b, ref c) = *self;
a.trace(trc);
b.trace(trc);
c.trace(trc);
}
}

no_jsmanaged_fields!(bool, f32, f64, String, Url, AtomicBool, Uuid);
no_jsmanaged_fields!(usize, u8, u16, u32, u64);
Expand Down
4 changes: 2 additions & 2 deletions components/script/dom/eventdispatcher.rs
Expand Up @@ -11,7 +11,7 @@ use dom::bindings::js::{JS, Root, RootedReference};
use dom::bindings::reflector::Reflectable;
use dom::bindings::trace::RootedVec;
use dom::event::{Event, EventPhase};
use dom::eventtarget::{EventListenerType, EventTarget, ListenerPhase};
use dom::eventtarget::{CompiledEventListener, EventTarget, ListenerPhase};
use dom::node::Node;
use dom::virtualmethods::vtable_for;
use dom::window::Window;
Expand All @@ -36,7 +36,7 @@ impl Drop for AutoDOMEventMarker {
}
}

fn handle_event(window: Option<&Window>, listener: &EventListenerType,
fn handle_event(window: Option<&Window>, listener: &CompiledEventListener,
current_target: &EventTarget, event: &Event) {
let _marker;
if let Some(window) = window {
Expand Down

0 comments on commit 5942e9e

Please sign in to comment.