зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #18113 - script: Optimize CompareDocumentPosition (from emilio:node-is-before); r=nox
I need this to compute the proper insertion point for a given stylesheet. Source-Repo: https://github.com/servo/servo Source-Revision: b6e0f4e9523d61ddbcef755e2d5887e05016e0a4 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 234e48a1d033944c9e980457708c4c373418f9a0
This commit is contained in:
Родитель
9d74019da3
Коммит
ac9d5325f1
|
@ -74,9 +74,10 @@ use selectors::matching::{matches_selector_list, MatchingContext, MatchingMode};
|
|||
use selectors::parser::SelectorList;
|
||||
use servo_arc::Arc;
|
||||
use servo_url::ServoUrl;
|
||||
use smallvec::SmallVec;
|
||||
use std::borrow::ToOwned;
|
||||
use std::cell::{Cell, UnsafeCell, RefMut};
|
||||
use std::cmp::max;
|
||||
use std::cmp;
|
||||
use std::default::Default;
|
||||
use std::iter;
|
||||
use std::mem;
|
||||
|
@ -384,6 +385,17 @@ impl Node {
|
|||
}
|
||||
}
|
||||
|
||||
/// Returns true if this node is before `other` in the same connected DOM
|
||||
/// tree.
|
||||
pub fn is_before(&self, other: &Node) -> bool {
|
||||
let cmp = other.CompareDocumentPosition(self);
|
||||
if cmp & NodeConstants::DOCUMENT_POSITION_DISCONNECTED != 0 {
|
||||
return false;
|
||||
}
|
||||
|
||||
cmp & NodeConstants::DOCUMENT_POSITION_PRECEDING != 0
|
||||
}
|
||||
|
||||
/// Return all registered mutation observers for this node.
|
||||
pub fn registered_mutation_observers(&self) -> RefMut<Vec<RegisteredObserver>> {
|
||||
self.mutation_observers.borrow_mut()
|
||||
|
@ -487,7 +499,7 @@ impl Node {
|
|||
// the document's version, but we do have to deal with the case where the node has moved
|
||||
// document, so may have a higher version count than its owning document.
|
||||
let doc: Root<Node> = Root::upcast(self.owner_doc());
|
||||
let version = max(self.inclusive_descendants_version(), doc.inclusive_descendants_version()) + 1;
|
||||
let version = cmp::max(self.inclusive_descendants_version(), doc.inclusive_descendants_version()) + 1;
|
||||
for ancestor in self.inclusive_ancestors() {
|
||||
ancestor.inclusive_descendants_version.set(version);
|
||||
}
|
||||
|
@ -627,8 +639,8 @@ impl Node {
|
|||
// Step 6 && Step 7
|
||||
(false, false, _, true) | (false, true, QuirksMode::Quirks, _) => {
|
||||
Rect::new(Point2D::new(window.ScrollX(), window.ScrollY()),
|
||||
Size2D::new(max(window.InnerWidth(), scroll_area.size.width),
|
||||
max(window.InnerHeight(), scroll_area.size.height)))
|
||||
Size2D::new(cmp::max(window.InnerWidth(), scroll_area.size.width),
|
||||
cmp::max(window.InnerHeight(), scroll_area.size.height)))
|
||||
},
|
||||
// Step 9
|
||||
_ => scroll_area
|
||||
|
@ -2363,55 +2375,70 @@ impl NodeMethods for Node {
|
|||
|
||||
// https://dom.spec.whatwg.org/#dom-node-comparedocumentposition
|
||||
fn CompareDocumentPosition(&self, other: &Node) -> u16 {
|
||||
// step 1.
|
||||
if self == other {
|
||||
// step 2.
|
||||
0
|
||||
} else {
|
||||
let mut lastself = Root::from_ref(self);
|
||||
let mut lastother = Root::from_ref(other);
|
||||
for ancestor in self.ancestors() {
|
||||
if &*ancestor == other {
|
||||
// step 4.
|
||||
return NodeConstants::DOCUMENT_POSITION_CONTAINS +
|
||||
NodeConstants::DOCUMENT_POSITION_PRECEDING;
|
||||
}
|
||||
lastself = ancestor;
|
||||
}
|
||||
for ancestor in other.ancestors() {
|
||||
if &*ancestor == self {
|
||||
// step 5.
|
||||
return NodeConstants::DOCUMENT_POSITION_CONTAINED_BY +
|
||||
NodeConstants::DOCUMENT_POSITION_FOLLOWING;
|
||||
}
|
||||
lastother = ancestor;
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
if lastself != lastother {
|
||||
let abstract_uint: uintptr_t = as_uintptr(&self);
|
||||
let other_uint: uintptr_t = as_uintptr(&*other);
|
||||
// FIXME(emilio): This will eventually need to handle attribute nodes.
|
||||
|
||||
let random = if abstract_uint < other_uint {
|
||||
let mut self_and_ancestors =
|
||||
self.inclusive_ancestors().collect::<SmallVec<[_; 20]>>();
|
||||
let mut other_and_ancestors =
|
||||
other.inclusive_ancestors().collect::<SmallVec<[_; 20]>>();
|
||||
|
||||
if self_and_ancestors.last() != other_and_ancestors.last() {
|
||||
let random =
|
||||
as_uintptr(self_and_ancestors.last().unwrap())
|
||||
< as_uintptr(other_and_ancestors.last().unwrap());
|
||||
let random = if random {
|
||||
NodeConstants::DOCUMENT_POSITION_FOLLOWING
|
||||
} else {
|
||||
NodeConstants::DOCUMENT_POSITION_PRECEDING
|
||||
};
|
||||
|
||||
// Disconnected.
|
||||
return random +
|
||||
NodeConstants::DOCUMENT_POSITION_DISCONNECTED +
|
||||
NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
|
||||
}
|
||||
|
||||
let mut parent = self_and_ancestors.pop().unwrap();
|
||||
other_and_ancestors.pop().unwrap();
|
||||
|
||||
let mut current_position = cmp::min(self_and_ancestors.len(), other_and_ancestors.len());
|
||||
|
||||
while current_position > 0 {
|
||||
current_position -= 1;
|
||||
let child_1 = self_and_ancestors.pop().unwrap();
|
||||
let child_2 = other_and_ancestors.pop().unwrap();
|
||||
|
||||
if child_1 != child_2 {
|
||||
let is_before =
|
||||
parent.children().position(|c| c == child_1).unwrap()
|
||||
< parent.children().position(|c| c == child_2).unwrap();
|
||||
// If I am before, `other` is following, and the other way
|
||||
// around.
|
||||
return if is_before {
|
||||
NodeConstants::DOCUMENT_POSITION_FOLLOWING
|
||||
} else {
|
||||
NodeConstants::DOCUMENT_POSITION_PRECEDING
|
||||
};
|
||||
// step 3.
|
||||
return random +
|
||||
NodeConstants::DOCUMENT_POSITION_DISCONNECTED +
|
||||
NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
|
||||
}
|
||||
|
||||
for child in lastself.traverse_preorder() {
|
||||
if &*child == other {
|
||||
// step 6.
|
||||
return NodeConstants::DOCUMENT_POSITION_PRECEDING;
|
||||
}
|
||||
if &*child == self {
|
||||
// step 7.
|
||||
return NodeConstants::DOCUMENT_POSITION_FOLLOWING;
|
||||
}
|
||||
}
|
||||
unreachable!()
|
||||
parent = child_1;
|
||||
}
|
||||
|
||||
// We hit the end of one of the parent chains, so one node needs to be
|
||||
// contained in the other.
|
||||
//
|
||||
// If we're the container, return that `other` is contained by us.
|
||||
return if self_and_ancestors.len() < other_and_ancestors.len() {
|
||||
NodeConstants::DOCUMENT_POSITION_FOLLOWING +
|
||||
NodeConstants::DOCUMENT_POSITION_CONTAINED_BY
|
||||
} else {
|
||||
NodeConstants::DOCUMENT_POSITION_PRECEDING +
|
||||
NodeConstants::DOCUMENT_POSITION_CONTAINS
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче