aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-06-29 17:05:18 -0600
committerbors-servo <metajack+bors@gmail.com>2015-06-29 17:05:18 -0600
commit836463b9e03f441aaf213ff48c99d50d8c1be5a5 (patch)
treea8a2c3ccbbeb91c35deae45e30d88dd50e73f4af /components/script
parent420cf4c8dcbe4bba822bb6980b301416d9b5526e (diff)
parent728ecc72b6a7f9a5af76ef86d5c268909ad81d79 (diff)
downloadservo-836463b9e03f441aaf213ff48c99d50d8c1be5a5.tar.gz
servo-836463b9e03f441aaf213ff48c99d50d8c1be5a5.zip
Auto merge of #6516 - michaelwu:fix-mozbrowser, r=glennw
Add JSAutoRequest/JSAutoCompartment to HTMLIFrameElement Fixes https://github.com/servo/servo/issues/6515 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6516) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/htmliframeelement.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index c6c5ca85f0b..f38a591bd45 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -14,6 +14,7 @@ use dom::bindings::error::{ErrorResult, Fallible};
use dom::bindings::error::Error::NotSupported;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{Root};
+use dom::bindings::utils::Reflectable;
use dom::customevent::CustomEvent;
use dom::document::Document;
use dom::element::{self, AttributeHandlers};
@@ -39,7 +40,7 @@ use std::borrow::ToOwned;
use std::cell::Cell;
use url::{Url, UrlParser};
use util::str::{self, LengthOrPercentageOrAuto};
-use js::jsapi::RootedValue;
+use js::jsapi::{RootedValue, JSAutoRequest, JSAutoCompartment};
use js::jsval::UndefinedValue;
enum SandboxAllowance {
@@ -155,6 +156,8 @@ impl<'a> HTMLIFrameElementHelpers for &'a HTMLIFrameElement {
if self.Mozbrowser() {
let window = window_from_node(self);
let cx = window.r().get_cx();
+ let _ar = JSAutoRequest::new(cx);
+ let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get());
let mut detail = RootedValue::new(cx, UndefinedValue());
event.detail().to_jsval(cx, detail.handle_mut());
let custom_event = CustomEvent::new(GlobalRef::Window(window.r()),