diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-03 08:19:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-03 08:19:04 -0700 |
commit | b0a8ce5341f5148e36523fee0b0fcbc2684c0a68 (patch) | |
tree | f7c3746dbfa55e7ba5d863a921b7a89211974858 /components/servo/lib.rs | |
parent | a9c58c99fb897f95f37d893ecb3994864ef58da9 (diff) | |
parent | d9c9d4ab369c09dae378cb886b9dc7409f114c8f (diff) | |
download | servo-b0a8ce5341f5148e36523fee0b0fcbc2684c0a68.tar.gz servo-b0a8ce5341f5148e36523fee0b0fcbc2684c0a68.zip |
Auto merge of #12178 - frewsxcv:prefs, r=emilio
Refactor `util::prefs` operations to be methods on static struct.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12178)
<!-- Reviewable:end -->
Diffstat (limited to 'components/servo/lib.rs')
-rw-r--r-- | components/servo/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 0a3b6c2a7e4..96296b92f09 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -81,8 +81,9 @@ use profile_traits::time; use script_traits::ConstellationMsg; use std::rc::Rc; use std::sync::mpsc::Sender; +use util::opts; +use util::prefs::PREFS; use util::resource_files::resources_dir_path; -use util::{opts, prefs}; pub use gleam::gl; @@ -257,7 +258,7 @@ pub fn run_content_process(token: String) { let unprivileged_content = unprivileged_content_receiver.recv().unwrap(); opts::set_defaults(unprivileged_content.opts()); - prefs::extend_prefs(unprivileged_content.prefs()); + PREFS.extend(unprivileged_content.prefs()); // Enter the sandbox if necessary. if opts::get().sandbox { |