mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
script: Fix merge fallout.
This commit is contained in:
parent
2aa5174246
commit
024c4df912
4 changed files with 14 additions and 11 deletions
|
@ -250,7 +250,7 @@ impl ResourceChannelManager {
|
|||
}
|
||||
}
|
||||
|
||||
struct ResourceManager {
|
||||
pub struct ResourceManager {
|
||||
user_agent: Option<String>,
|
||||
cookie_storage: CookieStorage,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
|
@ -260,10 +260,10 @@ struct ResourceManager {
|
|||
}
|
||||
|
||||
impl ResourceManager {
|
||||
fn new(user_agent: Option<String>,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
hsts_list: HSTSList,
|
||||
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
|
||||
pub fn new(user_agent: Option<String>,
|
||||
resource_task: IpcSender<ControlMsg>,
|
||||
hsts_list: HSTSList,
|
||||
devtools_channel: Option<Sender<DevtoolsControlMsg>>) -> ResourceManager {
|
||||
ResourceManager {
|
||||
user_agent: user_agent,
|
||||
cookie_storage: CookieStorage::new(),
|
||||
|
|
|
@ -24,10 +24,6 @@ git = "https://github.com/servo/rust-stb-image"
|
|||
version = "0.6"
|
||||
features = [ "serde-serialization" ]
|
||||
|
||||
[dependencies.url]
|
||||
version = "0.2.36"
|
||||
features = [ "serde_serialization" ]
|
||||
|
||||
[dependencies.ipc-channel]
|
||||
git = "https://github.com/pcwalton/ipc-channel"
|
||||
|
||||
|
|
|
@ -65,7 +65,6 @@ use net_traits::image::base::Image;
|
|||
use profile_traits::mem::ProfilerChan;
|
||||
use util::str::{LengthOrPercentageOrAuto};
|
||||
use selectors::parser::PseudoElement;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::cell::{Cell, UnsafeCell, RefCell};
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::collections::hash_state::HashState;
|
||||
|
@ -357,6 +356,13 @@ impl JSTraceable for Box<LayoutRPC+'static> {
|
|||
}
|
||||
}
|
||||
|
||||
impl JSTraceable for () {
|
||||
#[inline]
|
||||
fn trace(&self, _: *mut JSTracer) {
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> JSTraceable for IpcReceiver<T> where T: Deserialize + Serialize {
|
||||
#[inline]
|
||||
fn trace(&self, _: *mut JSTracer) {
|
||||
|
|
|
@ -7,6 +7,7 @@ use net::hsts::HSTSEntry;
|
|||
use net_traits::IncludeSubdomains;
|
||||
use net::hsts::{secure_url, preload_hsts_domains};
|
||||
use net::resource_task::ResourceManager;
|
||||
use ipc_channel::ipc;
|
||||
use std::sync::mpsc::channel;
|
||||
use url::Url;
|
||||
use time;
|
||||
|
@ -17,7 +18,7 @@ fn test_add_hsts_entry_to_resource_manager_adds_an_hsts_entry() {
|
|||
entries: Vec::new()
|
||||
};
|
||||
|
||||
let (tx, _) = channel();
|
||||
let (tx, _) = ipc::channel().unwrap();
|
||||
let mut manager = ResourceManager::new(None, tx, list, None);
|
||||
|
||||
let entry = HSTSEntry::new(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue