mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Refactor util::prefs
operations to be methods on static struct.
This commit is contained in:
parent
307844a8c1
commit
22928f50ac
30 changed files with 166 additions and 162 deletions
|
@ -60,7 +60,7 @@ use timer_scheduler::TimerScheduler;
|
|||
use url::Url;
|
||||
use util::geometry::PagePx;
|
||||
use util::opts;
|
||||
use util::prefs::mozbrowser_enabled;
|
||||
use util::prefs::PREFS;
|
||||
use util::thread::spawn_named;
|
||||
use webrender_traits;
|
||||
|
||||
|
@ -1146,7 +1146,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
|
|||
}
|
||||
|
||||
fn handle_alert(&mut self, pipeline_id: PipelineId, message: String, sender: IpcSender<bool>) {
|
||||
let display_alert_dialog = if mozbrowser_enabled() {
|
||||
let display_alert_dialog = if PREFS.is_mozbrowser_enabled() {
|
||||
let parent_pipeline_info = self.pipelines.get(&pipeline_id).and_then(|source| source.parent_info);
|
||||
if let Some(_) = parent_pipeline_info {
|
||||
let root_pipeline_id = self.root_frame_id
|
||||
|
@ -1457,7 +1457,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
|
|||
containing_pipeline_id: PipelineId,
|
||||
subpage_id: SubpageId,
|
||||
event: MozBrowserEvent) {
|
||||
assert!(mozbrowser_enabled());
|
||||
assert!(PREFS.is_mozbrowser_enabled());
|
||||
|
||||
// Find the script channel for the given parent pipeline,
|
||||
// and pass the event to that script thread.
|
||||
|
@ -2046,7 +2046,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
|
|||
if let Some(pipeline_id) = rng.choose(&*pipeline_ids) {
|
||||
if let Some(pipeline) = self.pipelines.get(pipeline_id) {
|
||||
// Don't kill the mozbrowser pipeline
|
||||
if mozbrowser_enabled() && pipeline.parent_info.is_none() {
|
||||
if PREFS.is_mozbrowser_enabled() && pipeline.parent_info.is_none() {
|
||||
info!("Not closing mozbrowser pipeline {}.", pipeline_id);
|
||||
} else {
|
||||
// Note that we deliberately do not do any of the tidying up
|
||||
|
@ -2132,7 +2132,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
|
|||
// https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowserlocationchange
|
||||
// Note that this is a no-op if the pipeline is not a mozbrowser iframe
|
||||
fn trigger_mozbrowserlocationchange(&self, pipeline_id: PipelineId) {
|
||||
if !mozbrowser_enabled() { return; }
|
||||
if !PREFS.is_mozbrowser_enabled() { return; }
|
||||
|
||||
let event_info = self.pipelines.get(&pipeline_id).and_then(|pipeline| {
|
||||
pipeline.parent_info.map(|(containing_pipeline_id, subpage_id, frame_type)| {
|
||||
|
@ -2158,7 +2158,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
|
|||
// https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsererror
|
||||
// Note that this does not require the pipeline to be an immediate child of the root
|
||||
fn trigger_mozbrowsererror(&self, pipeline_id: PipelineId, reason: String, backtrace: String) {
|
||||
if !mozbrowser_enabled() { return; }
|
||||
if !PREFS.is_mozbrowser_enabled() { return; }
|
||||
|
||||
let ancestor_info = self.get_mozbrowser_ancestor_info(pipeline_id);
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ use util;
|
|||
use util::geometry::{PagePx, ViewportPx};
|
||||
use util::ipc::OptionalIpcSender;
|
||||
use util::opts::{self, Opts};
|
||||
use util::prefs::{self, Pref};
|
||||
use util::prefs::{PREFS, Pref};
|
||||
use webrender_traits;
|
||||
|
||||
pub enum ChildProcess {
|
||||
|
@ -234,7 +234,7 @@ impl Pipeline {
|
|||
panic_chan: state.panic_chan,
|
||||
script_port: script_port,
|
||||
opts: (*opts::get()).clone(),
|
||||
prefs: prefs::get_cloned(),
|
||||
prefs: PREFS.cloned(),
|
||||
layout_to_paint_chan: layout_to_paint_chan,
|
||||
pipeline_port: pipeline_port,
|
||||
pipeline_namespace_id: state.pipeline_namespace_id,
|
||||
|
@ -378,7 +378,7 @@ impl Pipeline {
|
|||
pub fn trigger_mozbrowser_event(&self,
|
||||
subpage_id: SubpageId,
|
||||
event: MozBrowserEvent) {
|
||||
assert!(prefs::mozbrowser_enabled());
|
||||
assert!(PREFS.is_mozbrowser_enabled());
|
||||
|
||||
let event = ConstellationControlMsg::MozBrowserEvent(self.id,
|
||||
subpage_id,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue