Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12970 - servo:thread-state, r=nox

Browse source 
Move thread_state to style.

<!-- 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/12970)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-22 10:39:51 -05:00 • committed by GitHub
commit 1911606e5c
14 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/cell.rs
View file

@ -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.
///

2
components/script/dom/bindings/js.rs
View file

@ -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
///

2
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -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

2
components/script/dom/node.rs
View file

@ -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;
//

4
components/script/dom/serviceworkerglobalscope.rs
View file

@ -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 {

2
components/script/script_runtime.rs
View file

@ -25,10 +25,10 @@ use std::io::{Write, stdout};
use std::marker::PhantomData;
use std::os;
use std::ptr;
use style::thread_state;
use time::{Tm, now};
use util::opts;
use util::prefs::PREFS;
use util::thread_state;
/// Common messages used to control the event loops in both the script and the worker
pub enum CommonScriptMsg {

2
components/script/script_thread.rs
View file

@ -99,6 +99,7 @@ use std::sync::atomic::{Ordering, AtomicBool};
use std::sync::mpsc::{Receiver, Select, Sender, channel};
use std::sync::{Arc, Mutex};
use style::context::ReflowGoal;
use style::thread_state;
use task_source::TaskSource;
use task_source::dom_manipulation::{DOMManipulationTaskSource, DOMManipulationTask};
use task_source::file_reading::FileReadingTaskSource;
@ -109,7 +110,6 @@ use time::Tm;
use url::{Url, Position};
use util::opts;
use util::thread;
use util::thread_state;
use webdriver_handlers;
thread_local!(pub static STACK_ROOTS: Cell<Option<RootCollectionPtr>> = Cell::new(None));