diff options
Diffstat (limited to 'components/script/dom/range.rs')
| -rw-r--r-- | components/script/dom/range.rs | 743 |
1 files changed, 434 insertions, 309 deletions
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index b5521e93d55..b48e186bc3f 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -1,34 +1,36 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -use dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; -use dom::bindings::codegen::Bindings::NodeBinding::NodeConstants; -use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; -use dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods; -use dom::bindings::codegen::Bindings::RangeBinding::{self, RangeConstants}; -use dom::bindings::codegen::Bindings::RangeBinding::RangeMethods; -use dom::bindings::codegen::Bindings::TextBinding::TextMethods; -use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; -use dom::bindings::error::{Error, ErrorResult, Fallible}; -use dom::bindings::inheritance::{CharacterDataTypeId, NodeTypeId}; -use dom::bindings::inheritance::Castable; -use dom::bindings::js::{JS, MutJS, Root, RootedReference}; -use dom::bindings::reflector::{Reflector, reflect_dom_object}; -use dom::bindings::str::DOMString; -use dom::bindings::trace::JSTraceable; -use dom::bindings::weakref::{WeakRef, WeakRefVec}; -use dom::characterdata::CharacterData; -use dom::document::Document; -use dom::documentfragment::DocumentFragment; -use dom::element::Element; -use dom::htmlscriptelement::HTMLScriptElement; -use dom::node::{Node, UnbindContext}; -use dom::text::Text; -use dom::window::Window; + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +use crate::dom::bindings::cell::DomRefCell; +use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods; +use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeConstants; +use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; +use crate::dom::bindings::codegen::Bindings::NodeListBinding::NodeListMethods; +use crate::dom::bindings::codegen::Bindings::RangeBinding::RangeConstants; +use crate::dom::bindings::codegen::Bindings::RangeBinding::RangeMethods; +use crate::dom::bindings::codegen::Bindings::TextBinding::TextMethods; +use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; +use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; +use crate::dom::bindings::inheritance::Castable; +use crate::dom::bindings::inheritance::{CharacterDataTypeId, NodeTypeId}; +use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; +use crate::dom::bindings::root::{Dom, DomRoot, MutDom}; +use crate::dom::bindings::str::DOMString; +use crate::dom::bindings::trace::JSTraceable; +use crate::dom::bindings::weakref::{WeakRef, WeakRefVec}; +use crate::dom::characterdata::CharacterData; +use crate::dom::document::Document; +use crate::dom::documentfragment::DocumentFragment; +use crate::dom::element::Element; +use crate::dom::htmlscriptelement::HTMLScriptElement; +use crate::dom::node::{Node, ShadowIncluding, UnbindContext}; +use crate::dom::selection::Selection; +use crate::dom::text::Text; +use crate::dom::window::Window; use dom_struct::dom_struct; -use heapsize::HeapSizeOf; use js::jsapi::JSTracer; +use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use std::cell::{Cell, UnsafeCell}; use std::cmp::{Ord, Ordering, PartialEq, PartialOrd}; @@ -37,31 +39,54 @@ pub struct Range { reflector_: Reflector, start: BoundaryPoint, end: BoundaryPoint, + // A range that belongs to a Selection needs to know about it + // so selectionchange can fire when the range changes. + // A range shouldn't belong to more than one Selection at a time, + // but from the spec as of Feb 1 2020 I can't rule out a corner case like: + // * Select a range R in document A, from node X to Y + // * Insert everything from X to Y into document B + // * Set B's selection's range to R + // which leaves R technically, and observably, associated with A even though + // it will fail the same-root-node check on many of A's selection's methods. + associated_selections: DomRefCell<Vec<Dom<Selection>>>, } impl Range { - fn new_inherited(start_container: &Node, start_offset: u32, - end_container: &Node, end_offset: u32) -> Range { + fn new_inherited( + start_container: &Node, + start_offset: u32, + end_container: &Node, + end_offset: u32, + ) -> Range { Range { reflector_: Reflector::new(), start: BoundaryPoint::new(start_container, start_offset), end: BoundaryPoint::new(end_container, end_offset), + associated_selections: DomRefCell::new(vec![]), } } - pub fn new_with_doc(document: &Document) -> Root<Range> { + pub fn new_with_doc(document: &Document) -> DomRoot<Range> { let root = document.upcast(); Range::new(document, root, 0, root, 0) } - pub fn new(document: &Document, - start_container: &Node, start_offset: u32, - end_container: &Node, end_offset: u32) - -> Root<Range> { - let range = reflect_dom_object(box Range::new_inherited(start_container, start_offset, - end_container, end_offset), - document.window(), - RangeBinding::Wrap); + pub fn new( + document: &Document, + start_container: &Node, + start_offset: u32, + end_container: &Node, + end_offset: u32, + ) -> DomRoot<Range> { + let range = reflect_dom_object( + Box::new(Range::new_inherited( + start_container, + start_offset, + end_container, + end_offset, + )), + document.window(), + ); start_container.ranges().push(WeakRef::new(&range)); if start_container != end_container { end_container.ranges().push(WeakRef::new(&range)); @@ -70,76 +95,97 @@ impl Range { } // https://dom.spec.whatwg.org/#dom-range - pub fn Constructor(window: &Window) -> Fallible<Root<Range>> { + #[allow(non_snake_case)] + pub fn Constructor(window: &Window) -> Fallible<DomRoot<Range>> { let document = window.Document(); Ok(Range::new_with_doc(&document)) } // https://dom.spec.whatwg.org/#contained fn contains(&self, node: &Node) -> bool { - match (bp_position(node, 0, &self.StartContainer(), self.StartOffset()), - bp_position(node, node.len(), &self.EndContainer(), self.EndOffset())) { + match ( + bp_position(node, 0, &self.StartContainer(), self.StartOffset()), + bp_position(node, node.len(), &self.EndContainer(), self.EndOffset()), + ) { (Some(Ordering::Greater), Some(Ordering::Less)) => true, - _ => false + _ => false, } } // https://dom.spec.whatwg.org/#partially-contained fn partially_contains(&self, node: &Node) -> bool { - self.StartContainer().inclusive_ancestors().any(|n| &*n == node) != - self.EndContainer().inclusive_ancestors().any(|n| &*n == node) + self.StartContainer() + .inclusive_ancestors(ShadowIncluding::No) + .any(|n| &*n == node) != + self.EndContainer() + .inclusive_ancestors(ShadowIncluding::No) + .any(|n| &*n == node) } // https://dom.spec.whatwg.org/#concept-range-clone - fn contained_children(&self) -> Fallible<(Option<Root<Node>>, - Option<Root<Node>>, - Vec<Root<Node>>)> { + fn contained_children( + &self, + ) -> Fallible<( + Option<DomRoot<Node>>, + Option<DomRoot<Node>>, + Vec<DomRoot<Node>>, + )> { let start_node = self.StartContainer(); let end_node = self.EndContainer(); // Steps 5-6. let common_ancestor = self.CommonAncestorContainer(); - let first_contained_child = - if start_node.is_inclusive_ancestor_of(&end_node) { - // Step 7. - None - } else { - // Step 8. - common_ancestor.children() - .find(|node| Range::partially_contains(self, node)) - }; + let first_contained_child = if start_node.is_inclusive_ancestor_of(&end_node) { + // Step 7. + None + } else { + // Step 8. + common_ancestor + .children() + .find(|node| Range::partially_contains(self, node)) + }; - let last_contained_child = - if end_node.is_inclusive_ancestor_of(&start_node) { - // Step 9. - None - } else { - // Step 10. - common_ancestor.rev_children() - .find(|node| Range::partially_contains(self, node)) - }; + let last_contained_child = if end_node.is_inclusive_ancestor_of(&start_node) { + // Step 9. + None + } else { + // Step 10. + common_ancestor + .rev_children() + .find(|node| Range::partially_contains(self, node)) + }; // Step 11. - let contained_children: Vec<Root<Node>> = - common_ancestor.children().filter(|n| self.contains(n)).collect(); + let contained_children: Vec<DomRoot<Node>> = common_ancestor + .children() + .filter(|n| self.contains(n)) + .collect(); // Step 12. if contained_children.iter().any(|n| n.is_doctype()) { return Err(Error::HierarchyRequest); } - Ok((first_contained_child, last_contained_child, contained_children)) + Ok(( + first_contained_child, + last_contained_child, + contained_children, + )) } // https://dom.spec.whatwg.org/#concept-range-bp-set fn set_start(&self, node: &Node, offset: u32) { + if &self.start.node != node || self.start.offset.get() != offset { + self.report_change(); + } if &self.start.node != node { if self.start.node == self.end.node { node.ranges().push(WeakRef::new(&self)); } else if &self.end.node == node { self.StartContainer().ranges().remove(self); } else { - node.ranges().push(self.StartContainer().ranges().remove(self)); + node.ranges() + .push(self.StartContainer().ranges().remove(self)); } } self.start.set(node, offset); @@ -147,13 +193,17 @@ impl Range { // https://dom.spec.whatwg.org/#concept-range-bp-set fn set_end(&self, node: &Node, offset: u32) { + if &self.end.node != node || self.end.offset.get() != offset { + self.report_change(); + } if &self.end.node != node { if self.end.node == self.start.node { node.ranges().push(WeakRef::new(&self)); } else if &self.start.node == node { self.EndContainer().ranges().remove(self); } else { - node.ranges().push(self.EndContainer().ranges().remove(self)); + node.ranges() + .push(self.EndContainer().ranges().remove(self)); } } self.end.set(node, offset); @@ -162,8 +212,14 @@ impl Range { // https://dom.spec.whatwg.org/#dom-range-comparepointnode-offset fn compare_point(&self, node: &Node, offset: u32) -> Fallible<Ordering> { let start_node = self.StartContainer(); - let start_node_root = start_node.inclusive_ancestors().last().unwrap(); - let node_root = node.inclusive_ancestors().last().unwrap(); + let start_node_root = start_node + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); + let node_root = node + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); if start_node_root != node_root { // Step 1. return Err(Error::WrongDocument); @@ -176,22 +232,45 @@ impl Range { // Step 3. return Err(Error::IndexSize); } - if let Ordering::Less = bp_position(node, offset, &start_node, self.StartOffset()).unwrap() { + if let Ordering::Less = bp_position(node, offset, &start_node, self.StartOffset()).unwrap() + { // Step 4. return Ok(Ordering::Less); } - if let Ordering::Greater = bp_position(node, offset, &self.EndContainer(), self.EndOffset()).unwrap() { + if let Ordering::Greater = + bp_position(node, offset, &self.EndContainer(), self.EndOffset()).unwrap() + { // Step 5. return Ok(Ordering::Greater); } // Step 6. Ok(Ordering::Equal) } + + pub fn associate_selection(&self, selection: &Selection) { + let mut selections = self.associated_selections.borrow_mut(); + if !selections.iter().any(|s| &**s == selection) { + selections.push(Dom::from_ref(selection)); + } + } + + pub fn disassociate_selection(&self, selection: &Selection) { + self.associated_selections + .borrow_mut() + .retain(|s| &**s != selection); + } + + fn report_change(&self) { + self.associated_selections + .borrow() + .iter() + .for_each(|s| s.queue_selectionchange_task()); + } } impl RangeMethods for Range { // https://dom.spec.whatwg.org/#dom-range-startcontainer - fn StartContainer(&self) -> Root<Node> { + fn StartContainer(&self) -> DomRoot<Node> { self.start.node.get() } @@ -201,7 +280,7 @@ impl RangeMethods for Range { } // https://dom.spec.whatwg.org/#dom-range-endcontainer - fn EndContainer(&self) -> Root<Node> { + fn EndContainer(&self) -> DomRoot<Node> { self.end.node.get() } @@ -216,17 +295,10 @@ impl RangeMethods for Range { } // https://dom.spec.whatwg.org/#dom-range-commonancestorcontainer - fn CommonAncestorContainer(&self) -> Root<Node> { - let end_container = self.EndContainer(); - // Step 1. - for container in self.StartContainer().inclusive_ancestors() { - // Step 2. - if container.is_inclusive_ancestor_of(&end_container) { - // Step 3. - return container; - } - } - unreachable!(); + fn CommonAncestorContainer(&self) -> DomRoot<Node> { + self.EndContainer() + .common_ancestor(&self.StartContainer(), ShadowIncluding::No) + .expect("Couldn't find common ancestor container") } // https://dom.spec.whatwg.org/#dom-range-setstart @@ -269,25 +341,25 @@ impl RangeMethods for Range { // https://dom.spec.whatwg.org/#dom-range-setstartbefore fn SetStartBefore(&self, node: &Node) -> ErrorResult { - let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); + let parent = node.GetParentNode().ok_or(Error::InvalidNodeType)?; self.SetStart(&parent, node.index()) } // https://dom.spec.whatwg.org/#dom-range-setstartafter fn SetStartAfter(&self, node: &Node) -> ErrorResult { - let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); + let parent = node.GetParentNode().ok_or(Error::InvalidNodeType)?; self.SetStart(&parent, node.index() + 1) } // https://dom.spec.whatwg.org/#dom-range-setendbefore fn SetEndBefore(&self, node: &Node) -> ErrorResult { - let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); + let parent = node.GetParentNode().ok_or(Error::InvalidNodeType)?; self.SetEnd(&parent, node.index()) } // https://dom.spec.whatwg.org/#dom-range-setendafter fn SetEndAfter(&self, node: &Node) -> ErrorResult { - let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); + let parent = node.GetParentNode().ok_or(Error::InvalidNodeType)?; self.SetEnd(&parent, node.index() + 1) } @@ -303,7 +375,7 @@ impl RangeMethods for Range { // https://dom.spec.whatwg.org/#dom-range-selectnode fn SelectNode(&self, node: &Node) -> ErrorResult { // Steps 1, 2. - let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); + let parent = node.GetParentNode().ok_or(Error::InvalidNodeType)?; // Step 3. let index = node.index(); // Step 4. @@ -329,32 +401,31 @@ impl RangeMethods for Range { } // https://dom.spec.whatwg.org/#dom-range-compareboundarypoints - fn CompareBoundaryPoints(&self, how: u16, other: &Range) - -> Fallible<i16> { + fn CompareBoundaryPoints(&self, how: u16, other: &Range) -> Fallible<i16> { if how > RangeConstants::END_TO_START { // Step 1. return Err(Error::NotSupported); } - let this_root = self.StartContainer().inclusive_ancestors().last().unwrap(); - let other_root = other.StartContainer().inclusive_ancestors().last().unwrap(); + let this_root = self + .StartContainer() + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); + let other_root = other + .StartContainer() + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); if this_root != other_root { // Step 2. return Err(Error::WrongDocument); } // Step 3. let (this_point, other_point) = match how { - RangeConstants::START_TO_START => { - (&self.start, &other.start) - }, - RangeConstants::START_TO_END => { - (&self.end, &other.start) - }, - RangeConstants::END_TO_END => { - (&self.end, &other.end) - }, - RangeConstants::END_TO_START => { - (&self.start, &other.end) - }, + RangeConstants::START_TO_START => (&self.start, &other.start), + RangeConstants::START_TO_END => (&self.end, &other.start), + RangeConstants::END_TO_END => (&self.end, &other.end), + RangeConstants::END_TO_START => (&self.start, &other.end), _ => unreachable!(), }; // step 4. @@ -366,11 +437,16 @@ impl RangeMethods for Range { } // https://dom.spec.whatwg.org/#dom-range-clonerange - fn CloneRange(&self) -> Root<Range> { + fn CloneRange(&self) -> DomRoot<Range> { let start_node = self.StartContainer(); let owner_doc = start_node.owner_doc(); - Range::new(&owner_doc, &start_node, self.StartOffset(), - &self.EndContainer(), self.EndOffset()) + Range::new( + &owner_doc, + &start_node, + self.StartOffset(), + &self.EndContainer(), + self.EndOffset(), + ) } // https://dom.spec.whatwg.org/#dom-range-ispointinrange @@ -382,27 +458,32 @@ impl RangeMethods for Range { Err(Error::WrongDocument) => { // Step 2. Ok(false) - } + }, Err(error) => Err(error), } } // https://dom.spec.whatwg.org/#dom-range-comparepoint fn ComparePoint(&self, node: &Node, offset: u32) -> Fallible<i16> { - self.compare_point(node, offset).map(|order| { - match order { - Ordering::Less => -1, - Ordering::Equal => 0, - Ordering::Greater => 1, - } + self.compare_point(node, offset).map(|order| match order { + Ordering::Less => -1, + Ordering::Equal => 0, + Ordering::Greater => 1, }) } // https://dom.spec.whatwg.org/#dom-range-intersectsnode fn IntersectsNode(&self, node: &Node) -> bool { let start_node = self.StartContainer(); - let start_node_root = self.StartContainer().inclusive_ancestors().last().unwrap(); - let node_root = node.inclusive_ancestors().last().unwrap(); + let start_node_root = self + .StartContainer() + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); + let node_root = node + .inclusive_ancestors(ShadowIncluding::No) + .last() + .unwrap(); if start_node_root != node_root { // Step 1. return false; @@ -417,15 +498,15 @@ impl RangeMethods for Range { // Step 4. let offset = node.index(); // Step 5. - Ordering::Greater == bp_position(&parent, offset + 1, - &start_node, self.StartOffset()).unwrap() && - Ordering::Less == bp_position(&parent, offset, - &self.EndContainer(), self.EndOffset()).unwrap() + Ordering::Greater == + bp_position(&parent, offset + 1, &start_node, self.StartOffset()).unwrap() && + Ordering::Less == + bp_position(&parent, offset, &self.EndContainer(), self.EndOffset()).unwrap() } // https://dom.spec.whatwg.org/#dom-range-clonecontents // https://dom.spec.whatwg.org/#concept-range-clone - fn CloneContents(&self) -> Fallible<Root<DocumentFragment>> { + fn CloneContents(&self) -> Fallible<DomRoot<DocumentFragment>> { // Step 3. let start_node = self.StartContainer(); let start_offset = self.StartOffset(); @@ -443,10 +524,12 @@ impl RangeMethods for Range { if end_node == start_node { if let Some(cdata) = start_node.downcast::<CharacterData>() { // Steps 4.1-2. - let data = cdata.SubstringData(start_offset, end_offset - start_offset).unwrap(); + let data = cdata + .SubstringData(start_offset, end_offset - start_offset) + .unwrap(); let clone = cdata.clone_with_data(data, &start_node.owner_doc()); // Step 4.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 4.4 return Ok(fragment); } @@ -454,41 +537,45 @@ impl RangeMethods for Range { // Steps 5-12. let (first_contained_child, last_contained_child, contained_children) = - try!(self.contained_children()); + self.contained_children()?; if let Some(child) = first_contained_child { // Step 13. if let Some(cdata) = child.downcast::<CharacterData>() { assert!(child == start_node); // Steps 13.1-2. - let data = cdata.SubstringData(start_offset, start_node.len() - start_offset).unwrap(); + let data = cdata + .SubstringData(start_offset, start_node.len() - start_offset) + .unwrap(); let clone = cdata.clone_with_data(data, &start_node.owner_doc()); // Step 13.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; } else { // Step 14.1. - let clone = child.CloneNode(false); + let clone = child.CloneNode(/* deep */ false)?; // Step 14.2. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 14.3. - let subrange = Range::new(&clone.owner_doc(), - &start_node, - start_offset, - &child, - child.len()); + let subrange = Range::new( + &clone.owner_doc(), + &start_node, + start_offset, + &child, + child.len(), + ); // Step 14.4. - let subfragment = try!(subrange.CloneContents()); + let subfragment = subrange.CloneContents()?; // Step 14.5. - try!(clone.AppendChild(subfragment.upcast())); + clone.AppendChild(subfragment.upcast())?; } } // Step 15. for child in contained_children { // Step 15.1. - let clone = child.CloneNode(true); + let clone = child.CloneNode(/* deep */ true)?; // Step 15.2. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; } if let Some(child) = last_contained_child { @@ -499,22 +586,18 @@ impl RangeMethods for Range { let data = cdata.SubstringData(0, end_offset).unwrap(); let clone = cdata.clone_with_data(data, &start_node.owner_doc()); // Step 16.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; } else { // Step 17.1. - let clone = child.CloneNode(false); + let clone = child.CloneNode(/* deep */ false)?; // Step 17.2. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 17.3. - let subrange = Range::new(&clone.owner_doc(), - &child, - 0, - &end_node, - end_offset); + let subrange = Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset); // Step 17.4. - let subfragment = try!(subrange.CloneContents()); + let subfragment = subrange.CloneContents()?; // Step 17.5. - try!(clone.AppendChild(subfragment.upcast())); + clone.AppendChild(subfragment.upcast())?; } } @@ -524,7 +607,7 @@ impl RangeMethods for Range { // https://dom.spec.whatwg.org/#dom-range-extractcontents // https://dom.spec.whatwg.org/#concept-range-extract - fn ExtractContents(&self) -> Fallible<Root<DocumentFragment>> { + fn ExtractContents(&self) -> Fallible<DomRoot<DocumentFragment>> { // Step 3. let start_node = self.StartContainer(); let start_offset = self.StartOffset(); @@ -542,16 +625,17 @@ impl RangeMethods for Range { if end_node == start_node { if let Some(end_data) = end_node.downcast::<CharacterData>() { // Step 4.1. - let clone = end_node.CloneNode(true); + let clone = end_node.CloneNode(/* deep */ true)?; // Step 4.2. let text = end_data.SubstringData(start_offset, end_offset - start_offset); - clone.downcast::<CharacterData>().unwrap().SetData(text.unwrap()); + clone + .downcast::<CharacterData>() + .unwrap() + .SetData(text.unwrap()); // Step 4.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 4.4. - try!(end_data.ReplaceData(start_offset, - end_offset - start_offset, - DOMString::new())); + end_data.ReplaceData(start_offset, end_offset - start_offset, DOMString::new())?; // Step 4.5. return Ok(fragment); } @@ -559,92 +643,101 @@ impl RangeMethods for Range { // Steps 5-12. let (first_contained_child, last_contained_child, contained_children) = - try!(self.contained_children()); + self.contained_children()?; let (new_node, new_offset) = if start_node.is_inclusive_ancestor_of(&end_node) { // Step 13. - (Root::from_ref(&*start_node), start_offset) + (DomRoot::from_ref(&*start_node), start_offset) } else { // Step 14.1-2. - let reference_node = start_node.ancestors() - .take_while(|n| !n.is_inclusive_ancestor_of(&end_node)) - .last() - .unwrap_or(Root::from_ref(&start_node)); + let reference_node = start_node + .ancestors() + .take_while(|n| !n.is_inclusive_ancestor_of(&end_node)) + .last() + .unwrap_or(DomRoot::from_ref(&start_node)); // Step 14.3. - (reference_node.GetParentNode().unwrap(), reference_node.index() + 1) + ( + reference_node.GetParentNode().unwrap(), + reference_node.index() + 1, + ) }; if let Some(child) = first_contained_child { if let Some(start_data) = child.downcast::<CharacterData>() { assert!(child == start_node); // Step 15.1. - let clone = start_node.CloneNode(true); + let clone = start_node.CloneNode(/* deep */ true)?; // Step 15.2. - let text = start_data.SubstringData(start_offset, - start_node.len() - start_offset); - clone.downcast::<CharacterData>().unwrap().SetData(text.unwrap()); + let text = start_data.SubstringData(start_offset, start_node.len() - start_offset); + clone + .downcast::<CharacterData>() + .unwrap() + .SetData(text.unwrap()); // Step 15.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 15.4. - try!(start_data.ReplaceData(start_offset, - start_node.len() - start_offset, - DOMString::new())); + start_data.ReplaceData( + start_offset, + start_node.len() - start_offset, + DOMString::new(), + )?; } else { // Step 16.1. - let clone = child.CloneNode(false); + let clone = child.CloneNode(/* deep */ false)?; // Step 16.2. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 16.3. - let subrange = Range::new(&clone.owner_doc(), - &start_node, - start_offset, - &child, - child.len()); + let subrange = Range::new( + &clone.owner_doc(), + &start_node, + start_offset, + &child, + child.len(), + ); // Step 16.4. - let subfragment = try!(subrange.ExtractContents()); + let subfragment = subrange.ExtractContents()?; // Step 16.5. - try!(clone.AppendChild(subfragment.upcast())); + clone.AppendChild(subfragment.upcast())?; } } // Step 17. for child in contained_children { - try!(fragment.upcast::<Node>().AppendChild(&child)); + fragment.upcast::<Node>().AppendChild(&child)?; } if let Some(child) = last_contained_child { if let Some(end_data) = child.downcast::<CharacterData>() { assert!(child == end_node); // Step 18.1. - let clone = end_node.CloneNode(true); + let clone = end_node.CloneNode(/* deep */ true)?; // Step 18.2. let text = end_data.SubstringData(0, end_offset); - clone.downcast::<CharacterData>().unwrap().SetData(text.unwrap()); + clone + .downcast::<CharacterData>() + .unwrap() + .SetData(text.unwrap()); // Step 18.3. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 18.4. - try!(end_data.ReplaceData(0, end_offset, DOMString::new())); + end_data.ReplaceData(0, end_offset, DOMString::new())?; } else { // Step 19.1. - let clone = child.CloneNode(false); + let clone = child.CloneNode(/* deep */ false)?; // Step 19.2. - try!(fragment.upcast::<Node>().AppendChild(&clone)); + fragment.upcast::<Node>().AppendChild(&clone)?; // Step 19.3. - let subrange = Range::new(&clone.owner_doc(), - &child, - 0, - &end_node, - end_offset); + let subrange = Range::new(&clone.owner_doc(), &child, 0, &end_node, end_offset); // Step 19.4. - let subfragment = try!(subrange.ExtractContents()); + let subfragment = subrange.ExtractContents()?; // Step 19.5. - try!(clone.AppendChild(subfragment.upcast())); + clone.AppendChild(subfragment.upcast())?; } } // Step 20. - try!(self.SetStart(&new_node, new_offset)); - try!(self.SetEnd(&new_node, new_offset)); + self.SetStart(&new_node, new_offset)?; + self.SetEnd(&new_node, new_offset)?; // Step 21. Ok(fragment) @@ -667,48 +760,47 @@ impl RangeMethods for Range { } match start_node.type_id() { // Handled under step 2. - NodeTypeId::CharacterData(CharacterDataTypeId::Text) => (), + NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) => (), NodeTypeId::CharacterData(_) => return Err(Error::HierarchyRequest), - _ => () + _ => (), } // Step 2. - let (reference_node, parent) = - if start_node.type_id() == NodeTypeId::CharacterData(CharacterDataTypeId::Text) { + let (reference_node, parent) = match start_node.type_id() { + NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) => { // Step 3. let parent = match start_node.GetParentNode() { Some(parent) => parent, // Step 1. - None => return Err(Error::HierarchyRequest) + None => return Err(Error::HierarchyRequest), }; // Step 5. - (Some(Root::from_ref(&*start_node)), parent) - } else { + (Some(DomRoot::from_ref(&*start_node)), parent) + }, + _ => { // Steps 4-5. let child = start_node.ChildNodes().Item(start_offset); - (child, Root::from_ref(&*start_node)) - }; + (child, DomRoot::from_ref(&*start_node)) + }, + }; // Step 6. - try!(Node::ensure_pre_insertion_validity(node, - &parent, - reference_node.r())); + Node::ensure_pre_insertion_validity(node, &parent, reference_node.as_deref())?; // Step 7. let split_text; - let reference_node = - match start_node.downcast::<Text>() { - Some(text) => { - split_text = try!(text.SplitText(start_offset)); - let new_reference = Root::upcast::<Node>(split_text); - assert!(new_reference.GetParentNode().r() == Some(&parent)); - Some(new_reference) - }, - _ => reference_node - }; + let reference_node = match start_node.downcast::<Text>() { + Some(text) => { + split_text = text.SplitText(start_offset)?; + let new_reference = DomRoot::upcast::<Node>(split_text); + assert!(new_reference.GetParentNode().as_deref() == Some(&parent)); + Some(new_reference) + }, + _ => reference_node, + }; // Step 8. - let reference_node = if Some(node) == reference_node.r() { + let reference_node = if Some(node) == reference_node.as_deref() { node.GetNextSibling() } else { reference_node @@ -718,18 +810,20 @@ impl RangeMethods for Range { node.remove_self(); // Step 10. - let new_offset = - reference_node.r().map_or(parent.len(), |node| node.index()); + let new_offset = reference_node + .as_ref() + .map_or(parent.len(), |node| node.index()); // Step 11 - let new_offset = new_offset + if node.type_id() == NodeTypeId::DocumentFragment { - node.len() - } else { - 1 - }; + let new_offset = new_offset + + if let NodeTypeId::DocumentFragment(_) = node.type_id() { + node.len() + } else { + 1 + }; // Step 12. - try!(Node::pre_insert(node, &parent, reference_node.r())); + Node::pre_insert(node, &parent, reference_node.as_deref())?; // Step 13. if self.Collapsed() { @@ -755,9 +849,10 @@ impl RangeMethods for Range { // Step 3. if start_node == end_node { if let Some(text) = start_node.downcast::<CharacterData>() { - return text.ReplaceData(start_offset, - end_offset - start_offset, - DOMString::new()); + if end_offset > start_offset { + self.report_change(); + } + return text.ReplaceData(start_offset, end_offset - start_offset, DOMString::new()); } } @@ -770,7 +865,7 @@ impl RangeMethods for Range { let mut next = iter.next(); while let Some(child) = next { if self.contains(&child) { - contained_children.push(JS::from_ref(&*child)); + contained_children.push(Dom::from_ref(&*child)); next = iter.next_skipping_children(); } else { next = iter.next(); @@ -779,14 +874,14 @@ impl RangeMethods for Range { let (new_node, new_offset) = if start_node.is_inclusive_ancestor_of(&end_node) { // Step 5. - (Root::from_ref(&*start_node), start_offset) + (DomRoot::from_ref(&*start_node), start_offset) } else { // Step 6. - fn compute_reference(start_node: &Node, end_node: &Node) -> (Root<Node>, u32) { - let mut reference_node = Root::from_ref(start_node); + fn compute_reference(start_node: &Node, end_node: &Node) -> (DomRoot<Node>, u32) { + let mut reference_node = DomRoot::from_ref(start_node); while let Some(parent) = reference_node.GetParentNode() { if parent.is_inclusive_ancestor_of(end_node) { - return (parent, reference_node.index() + 1) + return (parent, reference_node.index() + 1); } reference_node = parent; } @@ -798,13 +893,16 @@ impl RangeMethods for Range { // Step 7. if let Some(text) = start_node.downcast::<CharacterData>() { - text.ReplaceData(start_offset, - start_node.len() - start_offset, - DOMString::new()).unwrap(); + text.ReplaceData( + start_offset, + start_node.len() - start_offset, + DOMString::new(), + ) + .unwrap(); } // Step 8. - for child in contained_children.r() { + for child in &*contained_children { child.remove_self(); } @@ -825,30 +923,36 @@ impl RangeMethods for Range { let start = self.StartContainer(); let end = self.EndContainer(); - if start.inclusive_ancestors().any(|n| !n.is_inclusive_ancestor_of(&end) && !n.is::<Text>()) || - end.inclusive_ancestors().any(|n| !n.is_inclusive_ancestor_of(&start) && !n.is::<Text>()) { - return Err(Error::InvalidState); + if start + .inclusive_ancestors(ShadowIncluding::No) + .any(|n| !n.is_inclusive_ancestor_of(&end) && !n.is::<Text>()) || + end.inclusive_ancestors(ShadowIncluding::No) + .any(|n| !n.is_inclusive_ancestor_of(&start) && !n.is::<Text>()) + { + return Err(Error::InvalidState); } // Step 2. match new_parent.type_id() { NodeTypeId::Document(_) | NodeTypeId::DocumentType | - NodeTypeId::DocumentFragment => return Err(Error::InvalidNodeType), - _ => () + NodeTypeId::DocumentFragment(_) => { + return Err(Error::InvalidNodeType); + }, + _ => (), } // Step 3. - let fragment = try!(self.ExtractContents()); + let fragment = self.ExtractContents()?; // Step 4. Node::replace_all(None, new_parent); // Step 5. - try!(self.InsertNode(new_parent)); + self.InsertNode(new_parent)?; // Step 6. - try!(new_parent.AppendChild(fragment.upcast())); + new_parent.AppendChild(fragment.upcast())?; // Step 7. self.SelectNode(new_parent) @@ -867,19 +971,24 @@ impl RangeMethods for Range { // Step 2. if start_node == end_node { - return char_data.SubstringData(self.StartOffset(), - self.EndOffset() - self.StartOffset()).unwrap(); + return char_data + .SubstringData(self.StartOffset(), self.EndOffset() - self.StartOffset()) + .unwrap(); } // Step 3. - s.push_str(&*char_data.SubstringData(self.StartOffset(), - char_data.Length() - self.StartOffset()).unwrap()); + s.push_str( + &*char_data + .SubstringData(self.StartOffset(), char_data.Length() - self.StartOffset()) + .unwrap(), + ); } // Step 4. let ancestor = self.CommonAncestorContainer(); - let mut iter = start_node.following_nodes(&ancestor) - .filter_map(Root::downcast::<Text>); + let mut iter = start_node + .following_nodes(&ancestor) + .filter_map(DomRoot::downcast::<Text>); while let Some(child) = iter.next() { if self.contains(child.upcast()) { @@ -898,27 +1007,31 @@ impl RangeMethods for Range { } // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#extensions-to-the-range-interface - fn CreateContextualFragment(&self, fragment: DOMString) -> Fallible<Root<DocumentFragment>> { + fn CreateContextualFragment(&self, fragment: DOMString) -> Fallible<DomRoot<DocumentFragment>> { // Step 1. let node = self.StartContainer(); let owner_doc = node.owner_doc(); let element = match node.type_id() { - NodeTypeId::Document(_) | NodeTypeId::DocumentFragment => None, - NodeTypeId::Element(_) => Some(Root::downcast::<Element>(node).unwrap()), + NodeTypeId::Document(_) | NodeTypeId::DocumentFragment(_) => None, + NodeTypeId::Element(_) => Some(DomRoot::downcast::<Element>(node).unwrap()), NodeTypeId::CharacterData(CharacterDataTypeId::Comment) | - NodeTypeId::CharacterData(CharacterDataTypeId::Text) => node.GetParentElement(), + NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) => node.GetParentElement(), NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) | NodeTypeId::DocumentType => unreachable!(), + NodeTypeId::Attr => unreachable!(), }; // Step 2. - let element = Element::fragment_parsing_context(&owner_doc, element.r()); + let element = Element::fragment_parsing_context(&owner_doc, element.as_deref()); // Step 3. - let fragment_node = try!(element.parse_fragment(fragment)); + let fragment_node = element.parse_fragment(fragment)?; // Step 4. - for node in fragment_node.upcast::<Node>().traverse_preorder() { + for node in fragment_node + .upcast::<Node>() + .traverse_preorder(ShadowIncluding::No) + { if let Some(script) = node.downcast::<HTMLScriptElement>() { script.set_already_started(false); script.set_parser_inserted(false); @@ -930,10 +1043,10 @@ impl RangeMethods for Range { } } -#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)] -#[must_root] +#[derive(DenyPublicFields, JSTraceable, MallocSizeOf)] +#[unrooted_must_root_lint::must_root] pub struct BoundaryPoint { - node: MutJS<Node>, + node: MutDom<Node>, offset: Cell<u32>, } @@ -942,7 +1055,7 @@ impl BoundaryPoint { debug_assert!(!node.is_doctype()); debug_assert!(offset <= node.len()); BoundaryPoint { - node: MutJS::new(node), + node: MutDom::new(node), offset: Cell::new(offset), } } @@ -960,23 +1073,24 @@ impl BoundaryPoint { #[allow(unrooted_must_root)] impl PartialOrd for BoundaryPoint { fn partial_cmp(&self, other: &Self) -> Option<Ordering> { - bp_position(&self.node.get(), self.offset.get(), - &other.node.get(), other.offset.get()) + bp_position( + &self.node.get(), + self.offset.get(), + &other.node.get(), + other.offset.get(), + ) } } #[allow(unrooted_must_root)] impl PartialEq for BoundaryPoint { fn eq(&self, other: &Self) -> bool { - self.node.get() == other.node.get() && - self.offset.get() == other.offset.get() + self.node.get() == other.node.get() && self.offset.get() == other.offset.get() } } // https://dom.spec.whatwg.org/#concept-range-bp-position -fn bp_position(a_node: &Node, a_offset: u32, - b_node: &Node, b_offset: u32) - -> Option<Ordering> { +fn bp_position(a_node: &Node, a_offset: u32, b_node: &Node, b_offset: u32) -> Option<Ordering> { if a_node as *const Node == b_node as *const Node { // Step 1. return Some(a_offset.cmp(&b_offset)); @@ -994,10 +1108,10 @@ fn bp_position(a_node: &Node, a_offset: u32, } } else if position & NodeConstants::DOCUMENT_POSITION_CONTAINS != 0 { // Step 3-1, 3-2. - let mut b_ancestors = b_node.inclusive_ancestors(); - let child = b_ancestors.find(|child| { - &*child.GetParentNode().unwrap() == a_node - }).unwrap(); + let mut b_ancestors = b_node.inclusive_ancestors(ShadowIncluding::No); + let child = b_ancestors + .find(|child| &*child.GetParentNode().unwrap() == a_node) + .unwrap(); // Step 3-3. if child.index() < a_offset { Some(Ordering::Greater) @@ -1019,7 +1133,9 @@ pub struct WeakRangeVec { impl WeakRangeVec { /// Create a new vector of weak references. pub fn new() -> Self { - WeakRangeVec { cell: UnsafeCell::new(WeakRefVec::new()) } + WeakRangeVec { + cell: UnsafeCell::new(WeakRefVec::new()), + } } /// Whether that vector of ranges is empty. @@ -1028,19 +1144,19 @@ impl WeakRangeVec { } /// Used for steps 2.1-2. when inserting a node. - /// https://dom.spec.whatwg.org/#concept-node-insert + /// <https://dom.spec.whatwg.org/#concept-node-insert> pub fn increase_above(&self, node: &Node, offset: u32, delta: u32) { self.map_offset_above(node, offset, |offset| offset + delta); } /// Used for steps 4-5. when removing a node. - /// https://dom.spec.whatwg.org/#concept-node-remove + /// <https://dom.spec.whatwg.org/#concept-node-remove> pub fn decrease_above(&self, node: &Node, offset: u32, delta: u32) { self.map_offset_above(node, offset, |offset| offset - delta); } /// Used for steps 2-3. when removing a node. - /// https://dom.spec.whatwg.org/#concept-node-remove + /// <https://dom.spec.whatwg.org/#concept-node-remove> pub fn drain_to_parent(&self, context: &UnbindContext, child: &Node) { if self.is_empty() { return; @@ -1049,7 +1165,7 @@ impl WeakRangeVec { let offset = context.index(); let parent = context.parent; unsafe { - let mut ranges = &mut *self.cell.get(); + let ranges = &mut *self.cell.get(); ranges.update(|entry| { let range = entry.root().unwrap(); @@ -1057,9 +1173,11 @@ impl WeakRangeVec { entry.remove(); } if &range.start.node == child { + range.report_change(); range.start.set(context.parent, offset); } if &range.end.node == child { + range.report_change(); range.end.set(context.parent, offset); } }); @@ -1069,14 +1187,14 @@ impl WeakRangeVec { } /// Used for steps 7.1-2. when normalizing a node. - /// https://dom.spec.whatwg.org/#dom-node-normalize + /// <https://dom.spec.whatwg.org/#dom-node-normalize> pub fn drain_to_preceding_text_sibling(&self, node: &Node, sibling: &Node, length: u32) { if self.is_empty() { return; } unsafe { - let mut ranges = &mut *self.cell.get(); + let ranges = &mut *self.cell.get(); ranges.update(|entry| { let range = entry.root().unwrap(); @@ -1084,9 +1202,11 @@ impl WeakRangeVec { entry.remove(); } if &range.start.node == node { + range.report_change(); range.start.set(sibling, range.StartOffset() + length); } if &range.end.node == node { + range.report_change(); range.end.set(sibling, range.EndOffset() + length); } }); @@ -1096,10 +1216,8 @@ impl WeakRangeVec { } /// Used for steps 7.3-4. when normalizing a node. - /// https://dom.spec.whatwg.org/#dom-node-normalize - pub fn move_to_text_child_at(&self, - node: &Node, offset: u32, - child: &Node, new_offset: u32) { + /// <https://dom.spec.whatwg.org/#dom-node-normalize> + pub fn move_to_text_child_at(&self, node: &Node, offset: u32, child: &Node, new_offset: u32) { unsafe { let child_ranges = &mut *child.ranges().cell.get(); @@ -1113,8 +1231,8 @@ impl WeakRangeVec { let move_end = node_is_end && range.EndOffset() == offset; let remove_from_node = move_start && move_end || - move_start && !node_is_end || - move_end && !node_is_start; + move_start && !node_is_end || + move_end && !node_is_start; let already_in_child = &range.start.node == child || &range.end.node == child; let push_to_child = !already_in_child && (move_start || move_end); @@ -1129,9 +1247,11 @@ impl WeakRangeVec { } if move_start { + range.report_change(); range.start.set(child, new_offset); } if move_end { + range.report_change(); range.end.set(child, new_offset); } }); @@ -1139,10 +1259,14 @@ impl WeakRangeVec { } /// Used for steps 8-11. when replacing character data. - /// https://dom.spec.whatwg.org/#concept-cd-replace - pub fn replace_code_units(&self, - node: &Node, offset: u32, - removed_code_units: u32, added_code_units: u32) { + /// <https://dom.spec.whatwg.org/#concept-cd-replace> + pub fn replace_code_units( + &self, + node: &Node, + offset: u32, + removed_code_units: u32, + added_code_units: u32, + ) { self.map_offset_above(node, offset, |range_offset| { if range_offset <= offset + removed_code_units { offset @@ -1153,10 +1277,8 @@ impl WeakRangeVec { } /// Used for steps 7.2-3. when splitting a text node. - /// https://dom.spec.whatwg.org/#concept-text-split - pub fn move_to_following_text_sibling_above(&self, - node: &Node, offset: u32, - sibling: &Node) { + /// <https://dom.spec.whatwg.org/#concept-text-split> + pub fn move_to_following_text_sibling_above(&self, node: &Node, offset: u32, sibling: &Node) { unsafe { let sibling_ranges = &mut *sibling.ranges().cell.get(); @@ -1172,11 +1294,10 @@ impl WeakRangeVec { let move_end = node_is_end && end_offset > offset; let remove_from_node = move_start && move_end || - move_start && !node_is_end || - move_end && !node_is_start; + move_start && !node_is_end || + move_end && !node_is_start; - let already_in_sibling = - &range.start.node == sibling || &range.end.node == sibling; + let already_in_sibling = &range.start.node == sibling || &range.end.node == sibling; let push_to_sibling = !already_in_sibling && (move_start || move_end); if remove_from_node { @@ -1189,9 +1310,11 @@ impl WeakRangeVec { } if move_start { + range.report_change(); range.start.set(sibling, start_offset - offset); } if move_end { + range.report_change(); range.end.set(sibling, end_offset - offset); } }); @@ -1199,15 +1322,17 @@ impl WeakRangeVec { } /// Used for steps 7.4-5. when splitting a text node. - /// https://dom.spec.whatwg.org/#concept-text-split + /// <https://dom.spec.whatwg.org/#concept-text-split> pub fn increment_at(&self, node: &Node, offset: u32) { unsafe { (*self.cell.get()).update(|entry| { let range = entry.root().unwrap(); if &range.start.node == node && offset == range.StartOffset() { + range.report_change(); range.start.set_offset(offset + 1); } if &range.end.node == node && offset == range.EndOffset() { + range.report_change(); range.end.set_offset(offset + 1); } }); @@ -1220,10 +1345,12 @@ impl WeakRangeVec { let range = entry.root().unwrap(); let start_offset = range.StartOffset(); if &range.start.node == node && start_offset > offset { + range.report_change(); range.start.set_offset(f(start_offset)); } let end_offset = range.EndOffset(); if &range.end.node == node && end_offset > offset { + range.report_change(); range.end.set_offset(f(end_offset)); } }); @@ -1239,18 +1366,16 @@ impl WeakRangeVec { fn remove(&self, range: &Range) -> WeakRef<Range> { unsafe { let ranges = &mut *self.cell.get(); - let position = ranges.iter().position(|ref_| { - ref_ == range - }).unwrap(); + let position = ranges.iter().position(|ref_| ref_ == range).unwrap(); ranges.swap_remove(position) } } } #[allow(unsafe_code)] -impl HeapSizeOf for WeakRangeVec { - fn heap_size_of_children(&self) -> usize { - unsafe { (*self.cell.get()).heap_size_of_children() } +impl MallocSizeOf for WeakRangeVec { + fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { + unsafe { (*self.cell.get()).size_of(ops) } } } |