mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00: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
|
@ -55,9 +55,6 @@ pub fn sandbox_access_files_dirs() -> Vec<PathBuf> {
|
|||
}
|
||||
|
||||
pub enum Resource {
|
||||
/// A json file of `servo_config::pref_util::Preferences` configuration.
|
||||
/// It can be empty but lots of features will be disabled.
|
||||
Preferences,
|
||||
/// A list of GATT services that are blocked from being used by web bluetooth.
|
||||
/// The format of the file is a list of UUIDs, one per line, with an optional second word to specify the
|
||||
/// type of blocklist.
|
||||
|
@ -121,7 +118,6 @@ pub enum Resource {
|
|||
impl Resource {
|
||||
pub fn filename(&self) -> &'static str {
|
||||
match self {
|
||||
Resource::Preferences => "prefs.json",
|
||||
Resource::BluetoothBlocklist => "gatt_blocklist.txt",
|
||||
Resource::DomainList => "public_domains.txt",
|
||||
Resource::HstsPreloadList => "hsts_preload.json",
|
||||
|
@ -164,7 +160,6 @@ fn resources_for_tests() -> Box<dyn ResourceReaderMethods + Sync + Send> {
|
|||
}
|
||||
fn read(&self, file: Resource) -> Vec<u8> {
|
||||
match file {
|
||||
Resource::Preferences => &include_bytes!("../../../resources/prefs.json")[..],
|
||||
Resource::BluetoothBlocklist => {
|
||||
&include_bytes!("../../../resources/gatt_blocklist.txt")[..]
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue