mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
api: Flatten and simplify Servo preferences (#34966)
Flatten and simplify Servo's preferences code. In addition, have both preferences and options passed in as arguments to `Servo::new()` and make sure not to use the globally set preferences in `servoshell` (as much as possible now). Instead of a complex procedural macro to generate preferences, just expose a very simple derive macro that adds string based getters and setters. - All command-line parsing is moved to servoshell. - There is no longer the concept of a missing preference. - Preferences no longer have to be part of the resources bundle because they now have reasonable default values. - servoshell specific preferences are no longer part of the preferences exposed by the Servo API. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
c4c85affb5
commit
0e616e0c5d
316 changed files with 2088 additions and 3235 deletions
|
@ -2,13 +2,12 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use ipc_channel::Error;
|
||||
use script_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use servo_config::opts::{self, Opts};
|
||||
use servo_config::prefs::{self, PrefValue};
|
||||
use servo_config::prefs;
|
||||
use servo_config::prefs::Preferences;
|
||||
use servo_url::ImmutableOrigin;
|
||||
|
||||
use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
|
||||
|
@ -18,7 +17,7 @@ use crate::sandboxing::{spawn_multiprocess, UnprivilegedContent};
|
|||
#[derive(Deserialize, Serialize)]
|
||||
pub struct ServiceWorkerUnprivilegedContent {
|
||||
opts: Opts,
|
||||
prefs: HashMap<String, PrefValue>,
|
||||
prefs: Box<Preferences>,
|
||||
senders: SWManagerSenders,
|
||||
origin: ImmutableOrigin,
|
||||
}
|
||||
|
@ -30,7 +29,7 @@ impl ServiceWorkerUnprivilegedContent {
|
|||
) -> ServiceWorkerUnprivilegedContent {
|
||||
ServiceWorkerUnprivilegedContent {
|
||||
opts: (*opts::get()).clone(),
|
||||
prefs: prefs::pref_map().iter().collect(),
|
||||
prefs: Box::new(prefs::get().clone()),
|
||||
senders,
|
||||
origin,
|
||||
}
|
||||
|
@ -53,7 +52,7 @@ impl ServiceWorkerUnprivilegedContent {
|
|||
self.opts.clone()
|
||||
}
|
||||
|
||||
pub fn prefs(&self) -> HashMap<String, PrefValue> {
|
||||
self.prefs.clone()
|
||||
pub fn prefs(&self) -> &Preferences {
|
||||
&self.prefs
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue