diff options
author | Peter Hall <peterjoel@gmail.com> | 2019-02-14 12:53:59 +0000 |
---|---|---|
committer | Peter Hall <peterjoel@gmail.com> | 2019-03-20 15:01:26 +0000 |
commit | 8bfd4dc1e2f9c71ff3d1f9964565c43a6ae02278 (patch) | |
tree | 3e59f25c2588711f4185c6fbba16af293d1d3453 /components/constellation/pipeline.rs | |
parent | 34fda66dfa5528f2b10a873e9a67417c6986c712 (diff) | |
download | servo-8bfd4dc1e2f9c71ff3d1f9964565c43a6ae02278.tar.gz servo-8bfd4dc1e2f9c71ff3d1f9964565c43a6ae02278.zip |
#8539 Config preferences backend restructure
Diffstat (limited to 'components/constellation/pipeline.rs')
-rw-r--r-- | components/constellation/pipeline.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index be369c0c08e..71d3f0aea62 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -31,7 +31,7 @@ use script_traits::{LayoutControlMsg, LayoutMsg, LoadData}; use script_traits::{NewLayoutInfo, SWManagerMsg, SWManagerSenders}; use script_traits::{ScriptThreadFactory, TimerSchedulerMsg, WindowSizeData}; use servo_config::opts::{self, Opts}; -use servo_config::prefs::{Pref, PREFS}; +use servo_config::{prefs, prefs::PrefValue}; use servo_url::ServoUrl; use std::collections::{HashMap, HashSet}; #[cfg(not(windows))] @@ -286,7 +286,7 @@ impl Pipeline { load_data: state.load_data.clone(), script_port: script_port, opts: (*opts::get()).clone(), - prefs: PREFS.cloned(), + prefs: prefs::pref_map().iter().collect(), pipeline_port: pipeline_port, pipeline_namespace_id: state.pipeline_namespace_id, layout_content_process_shutdown_chan: layout_content_process_shutdown_chan, @@ -482,7 +482,7 @@ pub struct UnprivilegedPipelineContent { load_data: LoadData, script_port: IpcReceiver<ConstellationControlMsg>, opts: Opts, - prefs: HashMap<String, Pref>, + prefs: HashMap<String, PrefValue>, pipeline_port: IpcReceiver<LayoutControlMsg>, pipeline_namespace_id: PipelineNamespaceId, layout_content_process_shutdown_chan: IpcSender<()>, @@ -681,7 +681,7 @@ impl UnprivilegedPipelineContent { self.opts.clone() } - pub fn prefs(&self) -> HashMap<String, Pref> { + pub fn prefs(&self) -> HashMap<String, PrefValue> { self.prefs.clone() } |