Remove `resources/prefs.json` (#34999)

This file is not used any longer.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

6 files changed, 2 insertions, 223 deletions

diff --git a/components/shared/embedder/resources.rs b/components/shared/embedder/resources.rs
index a29abf5328b..16f346a1663 100644
--- a/components/shared/embedder/resources.rs
+++ b/components/shared/embedder/resources.rs
@@ -144,8 +144,7 @@ pub trait ResourceReaderMethods {
 
 /// Bake all of our resources into this crate for tests, unless we are `cfg!(servo_production)`.
 ///
-/// Local non-production embedder builds (e.g. servoshell) can still override these with [`set`],
-/// if runtime loading of prefs.json and other resources is needed.
+/// Local non-production embedder builds (e.g. servoshell) can still override these with [`set`].
 /// On OpenHarmony we never want to include files, since we ship all the files in the application
 /// bundle anyway.
 #[cfg(not(any(servo_production, target_env = "ohos")))]
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 0ecc376f93d..577d3c8d231 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -81,27 +81,6 @@ def copy_windows_dependencies(binary_path, destination):
             shutil.copy(path.join(binary_path, f), destination)
 
 
-def change_prefs(resources_path, platform):
-    print("Swapping prefs")
-    prefs_path = path.join(resources_path, "prefs.json")
-    package_prefs_path = path.join(resources_path, "package-prefs.json")
-    with open(prefs_path) as prefs, open(package_prefs_path) as package_prefs:
-        prefs = json.load(prefs)
-        pref_sets = []
-        package_prefs = json.load(package_prefs)
-        if "all" in package_prefs:
-            pref_sets += [package_prefs["all"]]
-        if platform in package_prefs:
-            pref_sets += [package_prefs[platform]]
-        for pref_set in pref_sets:
-            for pref in pref_set:
-                if pref in prefs:
-                    prefs[pref] = pref_set[pref]
-        with open(prefs_path, "w") as out:
-            json.dump(prefs, out, sort_keys=True, indent=2)
-    delete(package_prefs_path)
-
-
 def check_call_with_randomized_backoff(args: List[str], retries: int) -> int:
     """
     Run the given command-line arguments via `subprocess.check_call()`. If the command
@@ -172,7 +151,6 @@ class PackageCommands(CommandBase):
                 delete(dir_to_resources)
 
             shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources)
-            change_prefs(dir_to_resources, "android")
 
             variant = ":assemble" + flavor_name + arch_string + build_type_string
             apk_task_name = ":servoapp" + variant
@@ -267,8 +245,6 @@ class PackageCommands(CommandBase):
             os.makedirs(lib_dir)
             shutil.copy2(binary_path, content_dir)
 
-            change_prefs(dir_to_resources, "macosx")
-
             print("Packaging GStreamer...")
             dmg_binary = path.join(content_dir, "servo")
             servo.gstreamer.package_gstreamer_dylibs(dmg_binary, lib_dir, self.target)
@@ -332,8 +308,6 @@ class PackageCommands(CommandBase):
             shutil.copy(binary_path, dir_to_temp)
             copy_windows_dependencies(target_dir, dir_to_temp)
 
-            change_prefs(dir_to_resources, "windows")
-
             # generate Servo.wxs
             import mako.template
             template_path = path.join(dir_to_root, "support", "windows", "Servo.wxs.mako")
@@ -401,8 +375,6 @@ class PackageCommands(CommandBase):
             shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources)
             shutil.copy(binary_path, dir_to_temp)
 
-            change_prefs(dir_to_resources, "linux")
-
             print("Creating tarball")
             tar_path = path.join(target_dir, 'servo-tech-demo.tar.gz')
 
diff --git a/python/tidy/test.py b/python/tidy/test.py
index a55bdc0ee24..98c50c3dcf4 100644
--- a/python/tidy/test.py
+++ b/python/tidy/test.py
@@ -186,22 +186,6 @@ class CheckTidiness(unittest.TestCase):
         self.assertEqual('emacs file variables present', next(errors)[2])
         self.assertNoMoreErrors(errors)
 
-    def test_malformed_json(self):
-        errors = tidy.collect_errors_for_files(iterFile('malformed_json.json'), [tidy.check_json], [], print_text=False)
-        self.assertEqual('Invalid control character at: line 3 column 40 (char 61)', next(errors)[2])
-        self.assertNoMoreErrors(errors)
-
-    def test_json_with_duplicate_key(self):
-        errors = tidy.collect_errors_for_files(iterFile('duplicate_key.json'), [tidy.check_json], [], print_text=False)
-        self.assertEqual('Duplicated Key (the_duplicated_key)', next(errors)[2])
-        self.assertNoMoreErrors(errors)
-
-    def test_json_with_unordered_keys(self):
-        tidy.config["check-ordered-json-keys"].append('python/tidy/tests/unordered_key.json')
-        errors = tidy.collect_errors_for_files(iterFile('unordered_key.json'), [tidy.check_json], [], print_text=False)
-        self.assertEqual('Unordered key (found b before a)', next(errors)[2])
-        self.assertNoMoreErrors(errors)
-
     def test_file_list(self):
         file_path = os.path.join(BASE_PATH, 'test_ignored')
         file_list = tidy.FileList(file_path, only_changed_files=False, exclude_dirs=[], progress=False)
diff --git a/python/tidy/tidy.py b/python/tidy/tidy.py
index 722abcb7325..03a937be9ec 100644
--- a/python/tidy/tidy.py
+++ b/python/tidy/tidy.py
@@ -46,7 +46,6 @@ config = {
     "skip-check-length": False,
     "skip-check-licenses": False,
     "check-alphabetical-order": True,
-    "check-ordered-json-keys": [],
     "lint-scripts": [],
     "blocked-packages": {},
     "ignore": {
@@ -709,44 +708,6 @@ def check_webidl_spec(file_name, contents):
     yield (0, "No specification link found.")
 
 
-def check_for_possible_duplicate_json_keys(key_value_pairs):
-    keys = [x[0] for x in key_value_pairs]
-    seen_keys = set()
-    for key in keys:
-        if key in seen_keys:
-            raise KeyError("Duplicated Key (%s)" % key)
-
-        seen_keys.add(key)
-
-
-def check_for_alphabetical_sorted_json_keys(key_value_pairs):
-    for a, b in zip(key_value_pairs[:-1], key_value_pairs[1:]):
-        if a[0] > b[0]:
-            raise KeyError("Unordered key (found %s before %s)" % (a[0], b[0]))
-
-
-def check_json_requirements(filename):
-    def check_fn(key_value_pairs):
-        check_for_possible_duplicate_json_keys(key_value_pairs)
-        if filename in normilize_paths(config["check-ordered-json-keys"]):
-            check_for_alphabetical_sorted_json_keys(key_value_pairs)
-    return check_fn
-
-
-def check_json(filename, contents):
-    if not filename.endswith(".json"):
-        return
-
-    try:
-        json.loads(contents, object_pairs_hook=check_json_requirements(filename))
-    except ValueError as e:
-        match = re.search(r"line (\d+) ", e.args[0])
-        line_no = match and match.group(1)
-        yield (line_no, e.args[0])
-    except KeyError as e:
-        yield (None, e.args[0])
-
-
 def check_that_manifests_exist():
     # Determine the metadata and test directories from the configuration file.
     metadata_dirs = []
@@ -1008,7 +969,7 @@ def scan(only_changed_files=False, progress=False):
     directory_errors = check_directory_files(config['check_ext'])
     # standard checks
     files_to_check = filter_files('.', only_changed_files, progress)
-    checking_functions = (check_flake8, check_webidl_spec, check_json)
+    checking_functions = (check_flake8, check_webidl_spec)
     line_checking_functions = (check_license, check_by_line, check_toml, check_shell,
                                check_rust, check_spec, check_modeline)
     file_errors = collect_errors_for_files(files_to_check, checking_functions, line_checking_functions)
diff --git a/resources/prefs.json b/resources/prefs.json
deleted file mode 100644
index 45d46759e57..00000000000
--- a/resources/prefs.json
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "devtools_server_enabled": false,
-  "devtools_server_port": 0,
-  "dom_abort_controller_enabled": false,
-  "dom_allow_scripts_to_close_windows": false,
-  "dom_bluetooth_enabled": false,
-  "dom_bluetooth_testing_enabled": false,
-  "dom_canvas_capture_enabled": false,
-  "dom_canvas_text_enabled": true,
-  "dom_clipboardevent_enabled": true,
-  "dom_compositionevent_enabled": false,
-  "dom_crypto_subtle_enabled": true,
-  "dom_customelements_enabled": true,
-  "dom_document_dblclick_dist": 1,
-  "dom_document_dblclick_timeout": 300,
-  "dom_forcetouch_enabled": false,
-  "dom_fullscreen_test": false,
-  "dom_gamepad_enabled": true,
-  "dom_imagebitmap_enabled": false,
-  "dom_intersection_observer_enabled": false,
-  "dom_microdata_enabled": false,
-  "dom_microdata_testing_enabled": false,
-  "dom_mouse_event_which_enabled": false,
-  "dom_mutation_observer_enabled": true,
-  "dom_offscreen_canvas_enabled": false,
-  "dom_permissions_enabled": false,
-  "dom_permissions_testing_allowed_in_nonsecure_contexts": false,
-  "dom_resize_observer_enabled": false,
-  "dom_script_asynch": true,
-  "dom_serviceworker_enabled": false,
-  "dom_serviceworker_timeout_seconds": 60,
-  "dom_servo_helpers_enabled": false,
-  "dom_servoparser_async_html_tokenizer_enabled": false,
-  "dom_shadowdom_enabled": false,
-  "dom_svg_enabled": false,
-  "dom_testable_crash_enabled": false,
-  "dom_testbinding_enabled": false,
-  "dom_testing_html_input_element_select_files_enabled": false,
-  "dom_webgl2_enabled": false,
-  "dom_webgpu_enabled": false,
-  "dom_webgpu_wgpu_backend": "",
-  "dom_webrtc_enabled": false,
-  "dom_webrtc_transceiver_enabled": false,
-  "dom_webvtt_enabled": false,
-  "dom_webxr_enabled": true,
-  "dom_webxr_first_person_observer_view": false,
-  "dom_webxr_glwindow_cubemap": false,
-  "dom_webxr_glwindow_enabled": true,
-  "dom_webxr_glwindow_left-right": false,
-  "dom_webxr_glwindow_red-cyan": false,
-  "dom_webxr_glwindow_spherical": false,
-  "dom_webxr_hands_enabled": true,
-  "dom_webxr_layers_enabled": false,
-  "dom_webxr_openxr_enabled": true,
-  "dom_webxr_sessionavailable": false,
-  "dom_webxr_test": false,
-  "dom_webxr_unsafe-assume-user-intent": false,
-  "dom_worklet_timeout_ms": 10,
-  "dom_xpath_enabled": false,
-  "gfx_subpixel-text-antialiasing_enabled": true,
-  "gfx_texture-swizzling_enabled": true,
-  "js_asmjs_enabled": true,
-  "js_asyncstack_enabled": false,
-  "js_baseline_interpreter_enabled": true,
-  "js_baseline_jit_enabled": true,
-  "js_baseline_jit_unsafe_eager_compilation_enabled": false,
-  "js_disable_jit": false,
-  "js_discard_system_source_enabled": false,
-  "js_dump_stack_on_debuggee_would_run_enabled": false,
-  "js_ion_enabled": true,
-  "js_ion_offthread_compilation_enabled": true,
-  "js_ion_unsafe_eager_compilation_enabled": false,
-  "js_mem_gc_allocation_threshold_avoid_interrupt_factor": 100,
-  "js_mem_gc_allocation_threshold_factor": 100,
-  "js_mem_gc_allocation_threshold_mb": 30,
-  "js_mem_gc_compacting_enabled": true,
-  "js_mem_gc_decommit_threshold_mb": 32,
-  "js_mem_gc_dynamic_heap_growth_enabled": true,
-  "js_mem_gc_dynamic_mark_slice_enabled": true,
-  "js_mem_gc_empty_chunk_count_max": 30,
-  "js_mem_gc_empty_chunk_count_min": 1,
-  "js_mem_gc_high_frequency_heap_growth_max": 300,
-  "js_mem_gc_high_frequency_heap_growth_min": 150,
-  "js_mem_gc_high_frequency_high_limit_mb": 500,
-  "js_mem_gc_high_frequency_low_limit_mb": 100,
-  "js_mem_gc_high_frequency_time_limit_ms": 1000,
-  "js_mem_gc_incremental_enabled": true,
-  "js_mem_gc_incremental_slice_ms": 10,
-  "js_mem_gc_low_frequency_heap_growth": 150,
-  "js_mem_gc_per_zone_enabled": false,
-  "js_mem_gc_zeal_frequency": 100,
-  "js_mem_gc_zeal_level": 0,
-  "js_mem_max": -1,
-  "js_native_regex_enabled": true,
-  "js_offthread_compilation_enabled": true,
-  "js_parallel_parsing_enabled": true,
-  "js_shared_memory_enabled": true,
-  "js_throw_on_asmjs_validation_failure_enabled": false,
-  "js_throw_on_debuggee_would_run_enabled": false,
-  "js_timers_minimum_duration": 1000,
-  "js_wasm_baseline_enabled": true,
-  "js_wasm_enabled": true,
-  "js_wasm_ion_enabled": true,
-  "js_werror_enabled": false,
-  "layout_animations_test_enabled": false,
-  "layout_columns_enabled": false,
-  "layout_css_transition-behavior_enabled": true,
-  "layout_flexbox_enabled": true,
-  "layout_grid_enabled": false,
-  "layout_legacy_layout": false,
-  "layout_threads": 3,
-  "layout_writing-mode_enabled": false,
-  "media_glvideo_enabled": false,
-  "media_testing_enabled": false,
-  "network_enforce_tls_enabled": false,
-  "network_enforce_tls_localhost": false,
-  "network_enforce_tls_onion": false,
-  "network_http-cache_disabled": false,
-  "network_local_directory_listing_enabled": false,
-  "network_mime_sniff": false,
-  "network_tls_ignore_unexpected_eof": false,
-  "session-history_max-length": 20,
-  "shell_background-color_rgba": [1.0, 1.0, 1.0, 1.0],
-  "shell_crash_reporter_enabled": false,
-  "shell_homepage": "https://servo_org",
-  "shell_keep_screen_on_enabled": false,
-  "shell_native-orientation": "both",
-  "shell_native-titlebar_enabled": true,
-  "shell_searchpage": "https://duckduckgo_com/html/?q=%s",
-  "threadpools_async_runtime_workers_max": 6,
-  "threadpools_fallback_worker_num": 3,
-  "threadpools_image_cache_workers_max": 4,
-  "threadpools_resource_workers_max": 4,
-  "threadpools_webrender_workers_max": 4,
-  "webgl_testing_context_creation_error": false
-}
diff --git a/servo-tidy.toml b/servo-tidy.toml
index d699b4ab0cf..9e5c79035ff 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -2,7 +2,6 @@
 skip-check-length = false
 skip-check-licenses = false
 check-alphabetical-order = true
-check-ordered-json-keys = ["./resources/prefs.json"]
 
 [ignore]
 # Files that are ignored for all tidy and lint checks.