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/permissions.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/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. |