diff options
| author | James Graham <james@hoppipolla.co.uk> | 2015-09-04 15:21:35 +0100 |
|---|---|---|
| committer | James Graham <james@hoppipolla.co.uk> | 2015-09-04 15:55:29 +0100 |
| commit | a208379f4604111e1770026d01cf1c0e50076c8b (patch) | |
| tree | 3b0bd2d833b482f0f7d3a4399bcc656e9209800a /components/script | |
| parent | cc1eb3f741554b3f1711cd1938d1c16b6b7d2879 (diff) | |
| download | servo-a208379f4604111e1770026d01cf1c0e50076c8b.tar.gz servo-a208379f4604111e1770026d01cf1c0e50076c8b.zip | |
Update prefs API to return an Option<bool>.
This allows for situations where there is no reasonable default
to apply for the pref value e.g. when we are just listing values
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/mouseevent.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index d4cd6cae3ac..b925e1ffee4 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -42,7 +42,7 @@ use url::{Url, UrlParser}; use util::str::{self, LengthOrPercentageOrAuto}; pub fn mozbrowser_enabled() -> bool { - prefs::get_pref("dom.mozbrowser.enabled", false) + prefs::get_pref("dom.mozbrowser.enabled").unwrap_or(false) } #[derive(HeapSizeOf)] diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 5fcd232826e..6b98dede144 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -171,7 +171,7 @@ impl MouseEventMethods for MouseEvent { // This returns the same result as current gecko. // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/which fn Which(&self) -> i32 { - if prefs::get_pref("dom.mouseevent.which.enabled", false) { + if prefs::get_pref("dom.mouseevent.which.enabled").unwrap_or(false) { (self.button.get() + 1) as i32 } else { 0 |