diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-15 01:24:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 01:24:39 -0800 |
| commit | 9702d6920a7cf6506fa26c042eb4b9f7cd061713 (patch) | |
| tree | 86c4b6bc3300a0873f093fb399c2be9fcc632016 /components/script/timers.rs | |
| parent | f3bacf84f47e12ef50cfd8ddd0aad613fe7e2a05 (diff) | |
| parent | be000d3833f77d7450624ae68d4ac9e1b3516748 (diff) | |
| download | servo-9702d6920a7cf6506fa26c042eb4b9f7cd061713.tar.gz servo-9702d6920a7cf6506fa26c042eb4b9f7cd061713.zip | |
Auto merge of #15545 - nox:plugin, r=SimonSapin
Kill some more plugins
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15545)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/timers.rs')
| -rw-r--r-- | components/script/timers.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs index c1f0a1de6c4..5de0dc2416b 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -28,8 +28,7 @@ use std::rc::Rc; #[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf, Hash, PartialOrd, Ord, Debug)] pub struct OneshotTimerHandle(i32); -#[derive(JSTraceable, HeapSizeOf)] -#[privatize] +#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] pub struct OneshotTimers { js_timers: JsTimers, #[ignore_heap_size_of = "Defined in std"] @@ -53,8 +52,7 @@ pub struct OneshotTimers { expected_event_id: Cell<TimerEventId>, } -#[derive(JSTraceable, HeapSizeOf)] -#[privatize] +#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] struct OneshotTimer { handle: OneshotTimerHandle, source: TimerSource, @@ -302,8 +300,7 @@ impl OneshotTimers { #[derive(JSTraceable, PartialEq, Eq, Copy, Clone, HeapSizeOf, Hash, PartialOrd, Ord)] pub struct JsTimerHandle(i32); -#[derive(JSTraceable, HeapSizeOf)] -#[privatize] +#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] pub struct JsTimers { next_timer_handle: Cell<JsTimerHandle>, active_timers: DOMRefCell<HashMap<JsTimerHandle, JsTimerEntry>>, |