aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmliframeelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-22 22:01:43 -0700
committerGitHub <noreply@github.com>2017-06-22 22:01:43 -0700
commitdd7540a5d4b81c1b7b72a2120b2ada948da7108e (patch)
tree4c9edd39bf5adea43c51d548b14904d7fd67ffb5 /components/script/dom/htmliframeelement.rs
parentd2bc0ff6314f75a7742567b1f7133a8c76120538 (diff)
parent433cd90bc305c74107c93fc04689239620ba22a8 (diff)
downloadservo-dd7540a5d4b81c1b7b72a2120b2ada948da7108e.tar.gz
servo-dd7540a5d4b81c1b7b72a2120b2ada948da7108e.zip
Auto merge of #17472 - moonlightdrive:globalscope-current-option, r=asajeffrey
return Option from GlobalScope::current <!-- Please describe your changes on the following line: --> handles the case where `GlobalScope::current` calls `CurrentGlobalOrNull` and the result is null --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17238 <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because: no functionality change & ./mach build -d has no errors <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17472) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r--components/script/dom/htmliframeelement.rs2
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;
}