diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-30 04:28:39 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-30 04:28:39 -0500 |
commit | 0ec30a6127432e22c56c2ee73c28479481e3cffc (patch) | |
tree | 25509c6642de260e25dd37e02ecb53e86f5bf048 /components/script/dom/window.rs | |
parent | b11648903bb07a31ec93f3030058ed41b3472b17 (diff) | |
parent | 704646698f685626dbf8448b067306db37883991 (diff) | |
download | servo-0ec30a6127432e22c56c2ee73c28479481e3cffc.tar.gz servo-0ec30a6127432e22c56c2ee73c28479481e3cffc.zip |
Auto merge of #11508 - nox:mozbrowser, r=Ms2ger
Fix permissions of mozbrowser and BrowserElementPrivileged (fixes #11498)
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11508)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 0f21139c324..4862cb83c9e 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1459,15 +1459,17 @@ impl Window { }) } + /// Returns whether this window is mozbrowser. + pub fn is_mozbrowser(&self) -> bool { + mozbrowser_enabled() && self.parent_info().is_none() + } + /// Returns whether mozbrowser is enabled and `obj` has been created /// in a top-level `Window` global. #[allow(unsafe_code)] pub unsafe fn global_is_mozbrowser(_: *mut JSContext, obj: HandleObject) -> bool { - if !mozbrowser_enabled() { - return false; - } match global_root_from_object(obj.get()).r() { - GlobalRef::Window(window) => window.parent_info().is_none(), + GlobalRef::Window(window) => window.is_mozbrowser(), _ => false, } } |