aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2016-08-22 16:05:00 +0200
committerMs2ger <Ms2ger@gmail.com>2016-08-22 16:08:56 +0200
commit307d1ced3cff2784c32f9523b74fd1c349481de6 (patch)
tree544e4fd99bf769879ccb9f320a65bb62be363ed7 /components/script/dom
parent32a0493cde3339fbc86867d197f356741ee77c09 (diff)
downloadservo-307d1ced3cff2784c32f9523b74fd1c349481de6.tar.gz
servo-307d1ced3cff2784c32f9523b74fd1c349481de6.zip
Move thread_state to style.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/cell.rs4
-rw-r--r--components/script/dom/bindings/js.rs2
-rw-r--r--components/script/dom/dedicatedworkerglobalscope.rs2
-rw-r--r--components/script/dom/node.rs2
-rw-r--r--components/script/dom/serviceworkerglobalscope.rs4
5 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs
index 3eb2a978c7a..29c4f8bad09 100644
--- a/components/script/dom/bindings/cell.rs
+++ b/components/script/dom/bindings/cell.rs
@@ -7,8 +7,8 @@
use dom::bindings::trace::JSTraceable;
use js::jsapi::JSTracer;
use std::cell::{BorrowError, BorrowMutError, Ref, RefCell, RefMut};
-use util::thread_state;
-use util::thread_state::SCRIPT;
+use style::thread_state;
+use style::thread_state::SCRIPT;
/// A mutable field in the DOM.
///
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index 12ff0aa8823..6a0dfd83dea 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -43,7 +43,7 @@ use std::intrinsics::type_name;
use std::mem;
use std::ops::Deref;
use std::ptr;
-use util::thread_state;
+use style::thread_state;
/// A traced reference to a DOM object
///
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index dfe385f0696..68899bd36b8 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -37,9 +37,9 @@ use std::mem::replace;
use std::sync::atomic::AtomicBool;
use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel};
use std::sync::{Arc, Mutex};
+use style::thread_state;
use url::Url;
use util::thread::spawn_named;
-use util::thread_state;
/// Set the `worker` field of a related DedicatedWorkerGlobalScope object to a particular
/// value for the duration of this object's lifetime. This ensures that the related Worker
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 34e69552f18..49aa8242b34 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -76,8 +76,8 @@ use std::ops::Range;
use string_cache::{Atom, Namespace, QualName};
use style::dom::OpaqueNode;
use style::selector_impl::ServoSelectorImpl;
+use style::thread_state;
use url::Url;
-use util::thread_state;
use uuid::Uuid;
//
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index dc8a8788a61..275fffdb99a 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -32,11 +32,11 @@ use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorke
use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel};
use std::thread;
use std::time::Duration;
+use style::thread_state;
+use style::thread_state::{IN_WORKER, SCRIPT};
use url::Url;
use util::prefs::PREFS;
use util::thread::spawn_named;
-use util::thread_state;
-use util::thread_state::{IN_WORKER, SCRIPT};
/// Messages used to control service worker event loop
pub enum ServiceWorkerScriptMsg {