diff options
author | moz-servo-sync <developer-services+moz-servo-sync@mozilla.org> | 2017-06-23 07:00:49 +0000 |
---|---|---|
committer | moz-servo-sync <developer-services+moz-servo-sync@mozilla.org> | 2017-06-23 07:00:49 +0000 |
commit | c292287adf39ab1c49b696d1a115ec4e3b0b2e9f (patch) | |
tree | 8660591e77aa59db8f4132cc6c7a77a19baf5fcc /components/script/dom/htmliframeelement.rs | |
parent | 1f79c01dfe95fc87788139891b3948bb54c277ad (diff) | |
parent | dd7540a5d4b81c1b7b72a2120b2ada948da7108e (diff) | |
download | servo-c292287adf39ab1c49b696d1a115ec4e3b0b2e9f.tar.gz servo-c292287adf39ab1c49b696d1a115ec4e3b0b2e9f.zip |
Merge commit 'refs/upstream/master' into gecko-backout
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 23feab87329..bde40d11a2b 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -590,7 +590,7 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement { Some(document) => document, }; // Step 4. - let current = GlobalScope::current().as_window().Document(); + let current = GlobalScope::current().expect("No current global object").as_window().Document(); if !current.origin().same_origin_domain(document.origin()) { return None; } |