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

Check for the presence of a window when working with event handlers forwarded to the window

Browse source
This commit is contained in:
Arseniy Ivanov 2017-02-02 18:14:02 -05:00
parent ca73b30fcf
commit d23b34e243
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,6 +366,9 @@ impl Document {
self.loader.borrow_mut() self.loader.borrow_mut()
} }
#[inline]
pub fn has_browsing_context(&self) -> bool { self.has_browsing_context }
/// https://html.spec.whatwg.org/multipage/#concept-document-bc /// https://html.spec.whatwg.org/multipage/#concept-document-bc
#[inline] #[inline]
pub fn browsing_context(&self) -> Option<Root<BrowsingContext>> { pub fn browsing_context(&self) -> Option<Root<BrowsingContext>> {

2
components/script/dom/htmlframesetelement.rs
View file

@ -10,7 +10,7 @@ use dom::bindings::js::Root;
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
use dom::document::Document; use dom::document::Document;
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::node::{Node, window_from_node}; use dom::node::{Node, document_from_node, window_from_node};
use html5ever_atoms::LocalName; use html5ever_atoms::LocalName;
#[dom_struct] #[dom_struct]

10
components/script/dom/macros.rs
View file

@ -354,11 +354,17 @@ macro_rules! define_event_handler(
macro_rules! define_window_owned_event_handler( macro_rules! define_window_owned_event_handler(
($handler: ident, $event_type: ident, $getter: ident, $setter: ident) => ( ($handler: ident, $event_type: ident, $getter: ident, $setter: ident) => (
fn $getter(&self) -> Option<::std::rc::Rc<$handler>> { fn $getter(&self) -> Option<::std::rc::Rc<$handler>> {
window_from_node(self).$getter() if document_from_node(self).has_browsing_context() {
window_from_node(self).$getter()
} else {
None
}
} }
fn $setter(&self, listener: Option<::std::rc::Rc<$handler>>) { fn $setter(&self, listener: Option<::std::rc::Rc<$handler>>) {
window_from_node(self).$setter(listener) if document_from_node(self).has_browsing_context() {
window_from_node(self).$setter(listener)
}
} }
) )
); );