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

Use internal mutability for Document::idmap.

Browse source
This commit is contained in:
Ms2ger 2014-06-11 22:38:08 +02:00
parent 04fe508e13
commit 34c42f6acb
2 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/components/script/dom/document.rs
View file

@ -10,7 +10,7 @@ use dom::bindings::codegen::InheritTypes::EventTargetCast;
use dom::bindings::codegen::Bindings::DocumentBinding; use dom::bindings::codegen::Bindings::DocumentBinding;
use dom::bindings::js::{JS, JSRef, Temporary, OptionalSettable, TemporaryPushable}; use dom::bindings::js::{JS, JSRef, Temporary, OptionalSettable, TemporaryPushable};
use dom::bindings::js::OptionalRootable; use dom::bindings::js::OptionalRootable;
use dom::bindings::trace::Untraceable; use dom::bindings::trace::{Traceable, Untraceable};
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::error::{ErrorResult, Fallible, NotSupported, InvalidCharacter}; use dom::bindings::error::{ErrorResult, Fallible, NotSupported, InvalidCharacter};
use dom::bindings::error::{HierarchyRequest, NamespaceError}; use dom::bindings::error::{HierarchyRequest, NamespaceError};
@ -63,7 +63,7 @@ pub struct Document {
pub node: Node, pub node: Node,
pub reflector_: Reflector, pub reflector_: Reflector,
pub window: JS<Window>, pub window: JS<Window>,
pub idmap: HashMap<DOMString, Vec<JS<Element>>>, idmap: Traceable<RefCell<HashMap<DOMString, Vec<JS<Element>>>>>,
pub implementation: Cell<Option<JS<DOMImplementation>>>, pub implementation: Cell<Option<JS<DOMImplementation>>>,
pub content_type: DOMString, pub content_type: DOMString,
pub encoding_name: Untraceable<RefCell<DOMString>>, pub encoding_name: Untraceable<RefCell<DOMString>>,
@ -86,8 +86,8 @@ pub trait DocumentHelpers {
fn content_changed(&self); fn content_changed(&self);
fn damage_and_reflow(&self, damage: DocumentDamageLevel); fn damage_and_reflow(&self, damage: DocumentDamageLevel);
fn wait_until_safe_to_modify_dom(&self); fn wait_until_safe_to_modify_dom(&self);
fn unregister_named_element(&mut self, to_unregister: &JSRef<Element>, id: DOMString); fn unregister_named_element(&self, to_unregister: &JSRef<Element>, id: DOMString);
fn register_named_element(&mut self, element: &JSRef<Element>, id: DOMString); fn register_named_element(&self, element: &JSRef<Element>, id: DOMString);
fn load_anchor_href(&self, href: DOMString); fn load_anchor_href(&self, href: DOMString);
} }
@ -122,28 +122,28 @@ impl<'a> DocumentHelpers for JSRef<'a, Document> {
/// Remove any existing association between the provided id and any elements in this document. /// Remove any existing association between the provided id and any elements in this document.
fn unregister_named_element(&mut self, fn unregister_named_element(&self,
to_unregister: &JSRef<Element>, to_unregister: &JSRef<Element>,
id: DOMString) { id: DOMString) {
let mut is_empty = false; let mut idmap = self.idmap.deref().borrow_mut();
match self.idmap.find_mut(&id) { let is_empty = match idmap.find_mut(&id) {
None => {}, None => false,
Some(elements) => { Some(elements) => {
let position = elements.iter() let position = elements.iter()
.map(|elem| elem.root()) .map(|elem| elem.root())
.position(|element| &*element == to_unregister) .position(|element| &*element == to_unregister)
.expect("This element should be in registered."); .expect("This element should be in registered.");
elements.remove(position); elements.remove(position);
is_empty = elements.is_empty(); elements.is_empty()
} }
} };
if is_empty { if is_empty {
self.idmap.remove(&id); idmap.remove(&id);
} }
} }
/// Associate an element present in this document with the provided id. /// Associate an element present in this document with the provided id.
fn register_named_element(&mut self, fn register_named_element(&self,
element: &JSRef<Element>, element: &JSRef<Element>,
id: DOMString) { id: DOMString) {
assert!({ assert!({
@ -151,10 +151,12 @@ impl<'a> DocumentHelpers for JSRef<'a, Document> {
node.is_in_doc() node.is_in_doc()
}); });
let mut idmap = self.idmap.deref().borrow_mut();
// FIXME https://github.com/mozilla/rust/issues/13195 // FIXME https://github.com/mozilla/rust/issues/13195
// Use mangle() when it exists again. // Use mangle() when it exists again.
let root = self.GetDocumentElement().expect("The element is in the document, so there must be a document element.").root(); let root = self.GetDocumentElement().expect("The element is in the document, so there must be a document element.").root();
match self.idmap.find_mut(&id) { match idmap.find_mut(&id) {
Some(elements) => { Some(elements) => {
let new_node: &JSRef<Node> = NodeCast::from_ref(element); let new_node: &JSRef<Node> = NodeCast::from_ref(element);
let mut head : uint = 0u; let mut head : uint = 0u;
@ -180,7 +182,7 @@ impl<'a> DocumentHelpers for JSRef<'a, Document> {
} }
let mut elements = vec!(); let mut elements = vec!();
elements.push_unrooted(element); elements.push_unrooted(element);
self.idmap.insert(id, elements); idmap.insert(id, elements);
} }
fn load_anchor_href(&self, href: DOMString) { fn load_anchor_href(&self, href: DOMString) {
@ -214,7 +216,7 @@ impl Document {
node: Node::new_without_doc(DocumentNodeTypeId), node: Node::new_without_doc(DocumentNodeTypeId),
reflector_: Reflector::new(), reflector_: Reflector::new(),
window: window.unrooted(), window: window.unrooted(),
idmap: HashMap::new(), idmap: Traceable::new(RefCell::new(HashMap::new())),
implementation: Cell::new(None), implementation: Cell::new(None),
content_type: match content_type { content_type: match content_type {
Some(string) => string.clone(), Some(string) => string.clone(),
@ -417,7 +419,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
// http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid // http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
fn GetElementById(&self, id: DOMString) -> Option<Temporary<Element>> { fn GetElementById(&self, id: DOMString) -> Option<Temporary<Element>> {
match self.idmap.find_equiv(&id) { match self.idmap.deref().borrow().find_equiv(&id) {
None => None, None => None,
Some(ref elements) => Some(Temporary::new(elements.get(0).clone())), Some(ref elements) => Some(Temporary::new(elements.get(0).clone())),
} }

8
src/components/script/dom/element.rs
View file

@ -795,8 +795,8 @@ impl<'a> VirtualMethods for JSRef<'a, Element> {
match self.get_attribute(Null, "id").root() { match self.get_attribute(Null, "id").root() {
Some(attr) => { Some(attr) => {
let mut doc = document_from_node(self).root(); let doc = document_from_node(self).root();
doc.register_named_element(self, attr.deref().Value()); doc.deref().register_named_element(self, attr.deref().Value());
} }
_ => () _ => ()
} }
@ -810,8 +810,8 @@ impl<'a> VirtualMethods for JSRef<'a, Element> {
match self.get_attribute(Null, "id").root() { match self.get_attribute(Null, "id").root() {
Some(attr) => { Some(attr) => {
let mut doc = document_from_node(self).root(); let doc = document_from_node(self).root();
doc.unregister_named_element(self, attr.deref().Value()); doc.deref().unregister_named_element(self, attr.deref().Value());
} }
_ => () _ => ()
} }