зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #8004 - Removed user agent parameter from being unnecessarily passed (from craftytrickster:user-agent/#7968); r=jdm
https://github.com/servo/servo/issues/7968 Source-Repo: https://github.com/servo/servo Source-Revision: bc58cd2de05b371f641051eb1038cd29e36bbb01
This commit is contained in:
Родитель
9485a11014
Коммит
02564b326f
|
@ -52,12 +52,13 @@ pub fn create_http_connector() -> Arc<Pool<Connector>> {
|
||||||
Arc::new(Pool::with_connector(Default::default(), connector))
|
Arc::new(Pool::with_connector(Default::default(), connector))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn factory(hsts_list: Arc<RwLock<HSTSList>>,
|
pub fn factory(user_agent: String,
|
||||||
|
hsts_list: Arc<RwLock<HSTSList>>,
|
||||||
cookie_jar: Arc<RwLock<CookieStorage>>,
|
cookie_jar: Arc<RwLock<CookieStorage>>,
|
||||||
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
|
devtools_chan: Option<Sender<DevtoolsControlMsg>>,
|
||||||
connector: Arc<Pool<Connector>>)
|
connector: Arc<Pool<Connector>>)
|
||||||
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>, String) + Send> {
|
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {
|
||||||
box move |load_data: LoadData, senders, classifier, user_agent| {
|
box move |load_data: LoadData, senders, classifier| {
|
||||||
spawn_named(format!("http_loader for {}", load_data.url.serialize()), move || {
|
spawn_named(format!("http_loader for {}", load_data.url.serialize()), move || {
|
||||||
load_for_consumer(load_data,
|
load_for_consumer(load_data,
|
||||||
senders,
|
senders,
|
||||||
|
|
|
@ -226,8 +226,8 @@ impl ResourceManager {
|
||||||
fn load(&mut self, load_data: LoadData, consumer: LoadConsumer) {
|
fn load(&mut self, load_data: LoadData, consumer: LoadConsumer) {
|
||||||
|
|
||||||
fn from_factory(factory: fn(LoadData, LoadConsumer, Arc<MIMEClassifier>))
|
fn from_factory(factory: fn(LoadData, LoadConsumer, Arc<MIMEClassifier>))
|
||||||
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>, String) + Send> {
|
-> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {
|
||||||
box move |load_data, senders, classifier, _user_agent| {
|
box move |load_data, senders, classifier| {
|
||||||
factory(load_data, senders, classifier)
|
factory(load_data, senders, classifier)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -235,7 +235,8 @@ impl ResourceManager {
|
||||||
let loader = match &*load_data.url.scheme {
|
let loader = match &*load_data.url.scheme {
|
||||||
"file" => from_factory(file_loader::factory),
|
"file" => from_factory(file_loader::factory),
|
||||||
"http" | "https" | "view-source" =>
|
"http" | "https" | "view-source" =>
|
||||||
http_loader::factory(self.hsts_list.clone(),
|
http_loader::factory(self.user_agent.clone(),
|
||||||
|
self.hsts_list.clone(),
|
||||||
self.cookie_storage.clone(),
|
self.cookie_storage.clone(),
|
||||||
self.devtools_chan.clone(),
|
self.devtools_chan.clone(),
|
||||||
self.connector.clone()),
|
self.connector.clone()),
|
||||||
|
@ -250,6 +251,6 @@ impl ResourceManager {
|
||||||
};
|
};
|
||||||
debug!("resource_task: loading url: {}", load_data.url.serialize());
|
debug!("resource_task: loading url: {}", load_data.url.serialize());
|
||||||
|
|
||||||
loader.call_box((load_data, consumer, self.mime_classifier.clone(), self.user_agent.clone()));
|
loader.call_box((load_data, consumer, self.mime_classifier.clone()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче