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

Always get browsing context from document

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-01-30 17:15:20 +01:00
parent 2e5c058463
commit be06f1e9b3
3 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/script/dom/document.rs
View file

@ -488,9 +488,14 @@ impl Document {
self.has_browsing_context
}
/// <https://html.spec.whatwg.org/multipage/#concept-document-bc>
#[inline]
pub fn browsing_context(&self) -> Option<DomRoot<WindowProxy>> {
self.document_or_shadow_root.browsing_context()
if self.has_browsing_context {
self.window.undiscarded_window_proxy()
} else {
None
}
}
#[inline]
@ -2622,7 +2627,7 @@ impl Document {
let has_browsing_context = has_browsing_context == HasBrowsingContext::Yes;
Document {
node: Node::new_document_node(),
document_or_shadow_root: DocumentOrShadowRootImpl::new(window, has_browsing_context),
document_or_shadow_root: DocumentOrShadowRootImpl::new(window),
window: Dom::from_ref(window),
has_browsing_context,
implementation: Default::default(),
@ -4263,14 +4268,22 @@ impl DocumentMethods for Document {
// https://drafts.csswg.org/cssom-view/#dom-document-elementfrompoint
fn ElementFromPoint(&self, x: Finite<f64>, y: Finite<f64>) -> Option<DomRoot<Element>> {
self.document_or_shadow_root
.element_from_point(x, y, self.GetDocumentElement())
self.document_or_shadow_root.element_from_point(
x,
y,
self.GetDocumentElement(),
self.has_browsing_context,
)
}
// https://drafts.csswg.org/cssom-view/#dom-document-elementsfrompoint
fn ElementsFromPoint(&self, x: Finite<f64>, y: Finite<f64>) -> Vec<DomRoot<Element>> {
self.document_or_shadow_root
.elements_from_point(x, y, self.GetDocumentElement())
self.document_or_shadow_root.elements_from_point(
x,
y,
self.GetDocumentElement(),
self.has_browsing_context,
)
}
// https://html.spec.whatwg.org/multipage/#dom-document-open