aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2015-11-02 14:21:11 -0800
committerEli Friedman <eli.friedman@gmail.com>2015-11-02 14:40:57 -0800
commitdf7fb8fa326e2b061e2da8c833cc558273db5f37 (patch)
tree538d53a61aaefbaa33f71dacb0b7d971b4eecbf2 /components/script/dom/window.rs
parentdb1163b1eceb5fef6463c4425e99d974a85a50a8 (diff)
downloadservo-df7fb8fa326e2b061e2da8c833cc558273db5f37.tar.gz
servo-df7fb8fa326e2b061e2da8c833cc558273db5f37.zip
Remove JSTraceable implementation from RefCell.
The implementation wasn't really right, and we would rather just use DOMRefCell anyway.
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index c074935938b..d87b04cbfba 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -58,7 +58,7 @@ use script_traits::{ConstellationControlMsg, TimerEventChan, TimerEventId, Timer
use selectors::parser::PseudoElement;
use std::ascii::AsciiExt;
use std::borrow::ToOwned;
-use std::cell::{Cell, Ref, RefCell};
+use std::cell::{Cell, Ref};
use std::collections::HashSet;
use std::default::Default;
use std::ffi::CString;
@@ -144,9 +144,9 @@ pub struct Window {
/// For sending timeline markers. Will be ignored if
/// no devtools server
#[ignore_heap_size_of = "TODO(#6909) need to measure HashSet"]
- devtools_markers: RefCell<HashSet<TimelineMarkerType>>,
+ devtools_markers: DOMRefCell<HashSet<TimelineMarkerType>>,
#[ignore_heap_size_of = "channels are hard"]
- devtools_marker_sender: RefCell<Option<IpcSender<TimelineMarker>>>,
+ devtools_marker_sender: DOMRefCell<Option<IpcSender<TimelineMarker>>>,
/// A flag to indicate whether the developer tools have requested live updates of
/// page changes.
@@ -208,7 +208,7 @@ pub struct Window {
/// A channel for communicating results of async scripts back to the webdriver server
#[ignore_heap_size_of = "channels are hard"]
- webdriver_script_chan: RefCell<Option<IpcSender<WebDriverJSResult>>>,
+ webdriver_script_chan: DOMRefCell<Option<IpcSender<WebDriverJSResult>>>,
/// The current state of the window object
current_state: Cell<WindowState>,
@@ -1276,10 +1276,10 @@ impl Window {
pending_reflow_count: Cell::new(0),
current_state: Cell::new(WindowState::Alive),
- devtools_marker_sender: RefCell::new(None),
- devtools_markers: RefCell::new(HashSet::new()),
+ devtools_marker_sender: DOMRefCell::new(None),
+ devtools_markers: DOMRefCell::new(HashSet::new()),
devtools_wants_updates: Cell::new(false),
- webdriver_script_chan: RefCell::new(None),
+ webdriver_script_chan: DOMRefCell::new(None),
};
WindowBinding::Wrap(runtime.cx(), win)