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

auto merge of #4909 : saneyuki/servo/warn, r=jdm

Browse source 
follow up #4893
This commit is contained in:
bors-servo 2015-02-12 14:06:49 -07:00
commit 6d1a2d90e5
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use js::jsapi::{JSTracer};
use util::task_state; use util::task_state;
use util::task_state::{SCRIPT, IN_GC}; use util::task_state::{SCRIPT, IN_GC};
use std::cell::{RefCell, Ref, RefMut}; use std::cell::{BorrowState, RefCell, Ref, RefMut};
/// A mutable field in the DOM. /// A mutable field in the DOM.
/// ///
@ -52,7 +52,7 @@ impl<T> DOMRefCell<T> {
/// ///
/// For safety checks in debug builds only. /// For safety checks in debug builds only.
pub fn is_mutably_borrowed(&self) -> bool { pub fn is_mutably_borrowed(&self) -> bool {
self.value.try_borrow().is_some() self.value.borrow_state() == BorrowState::Writing
} }
/// Attempts to immutably borrow the wrapped value. /// Attempts to immutably borrow the wrapped value.
@ -67,7 +67,10 @@ impl<T> DOMRefCell<T> {
/// Panics if this is called off the script thread. /// Panics if this is called off the script thread.
pub fn try_borrow<'a>(&'a self) -> Option<Ref<'a, T>> { pub fn try_borrow<'a>(&'a self) -> Option<Ref<'a, T>> {
debug_assert!(task_state::get().is_script()); debug_assert!(task_state::get().is_script());
self.value.try_borrow() match self.value.borrow_state() {
BorrowState::Writing => None,
_ => Some(self.value.borrow()),
}
} }
/// Mutably borrows the wrapped value. /// Mutably borrows the wrapped value.
@ -82,7 +85,10 @@ impl<T> DOMRefCell<T> {
/// Panics if this is called off the script thread. /// Panics if this is called off the script thread.
pub fn try_borrow_mut<'a>(&'a self) -> Option<RefMut<'a, T>> { pub fn try_borrow_mut<'a>(&'a self) -> Option<RefMut<'a, T>> {
debug_assert!(task_state::get().is_script()); debug_assert!(task_state::get().is_script());
self.value.try_borrow_mut() match self.value.borrow_state() {
BorrowState::Unused => Some(self.value.borrow_mut()),
_ => None,
}
} }
} }