diff options
| author | Jyotsna Prakash <jyotsna.prakash@gmail.com> | 2017-06-21 20:34:21 -0700 |
|---|---|---|
| committer | Jyotsna Prakash <jyotsna.prakash@gmail.com> | 2017-06-22 10:04:06 -0700 |
| commit | 433cd90bc305c74107c93fc04689239620ba22a8 (patch) | |
| tree | f55768070c839b5ad8cc155055c9c0b788813cc7 /components/script/dom/permissions.rs | |
| parent | dfc44a0d35a1905247cddb926c99e87000b96b59 (diff) | |
| download | servo-433cd90bc305c74107c93fc04689239620ba22a8.tar.gz servo-433cd90bc305c74107c93fc04689239620ba22a8.zip | |
return Option from GlobalScope::current
handles the case where GlobalScope::current calls CurrentGlobalOrNull
and the result is null
Diffstat (limited to 'components/script/dom/permissions.rs')
| -rw-r--r-- | components/script/dom/permissions.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index b5cab2ace90..3368782d06e 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -241,7 +241,7 @@ impl PermissionAlgorithm for Permissions { let state = prompt_user(&format!("{} {} ?", REQUEST_DIALOG_MESSAGE, perm_name.clone())); - let globalscope = GlobalScope::current(); + let globalscope = GlobalScope::current().expect("No current global object"); globalscope.as_window() .permission_state_invocation_results() .borrow_mut() @@ -266,7 +266,7 @@ pub fn get_descriptor_permission_state(permission_name: PermissionName, // Step 1. let settings = match env_settings_obj { Some(env_settings_obj) => Root::from_ref(env_settings_obj), - None => GlobalScope::current(), + None => GlobalScope::current().expect("No current global object"), }; // Step 2. |