Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove Document::load_async.

Browse source
This commit is contained in:
Ms2ger 2016-10-10 18:24:24 +02:00
parent 2bb7cc227b
commit 7b905a5590
2 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

35
components/script/document_loader.rs
View file

@ -8,9 +8,8 @@
use dom::bindings::js::JS; use dom::bindings::js::JS;
use dom::document::Document; use dom::document::Document;
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use msg::constellation_msg::PipelineId;
use net_traits::{AsyncResponseTarget, CoreResourceMsg, load_async}; use net_traits::{CoreResourceMsg, FetchResponseMsg, ResourceThreads, IpcSend};
use net_traits::{FetchResponseMsg, LoadContext, ResourceThreads, IpcSend};
use net_traits::request::RequestInit; use net_traits::request::RequestInit;
use std::thread; use std::thread;
use url::Url; use url::Url;
@ -36,20 +35,10 @@ impl LoadType {
LoadType::PageSource(ref url) => url, LoadType::PageSource(ref url) => url,
} }
} }
fn to_load_context(&self) -> LoadContext {
match *self {
LoadType::Image(_) => LoadContext::Image,
LoadType::Script(_) => LoadContext::Script,
LoadType::Subframe(_) | LoadType::PageSource(_) => LoadContext::Browsing,
LoadType::Stylesheet(_) => LoadContext::Style,
LoadType::Media(_) => LoadContext::AudioVideo,
}
}
} }
/// Canary value ensuring that manually added blocking loads (ie. ones that weren't /// Canary value ensuring that manually added blocking loads (ie. ones that weren't
/// created via DocumentLoader::{load_async, fetch_async}) are always removed by the time /// created via DocumentLoader::fetch_async) are always removed by the time
/// that the owner is destroyed. /// that the owner is destroyed.
#[derive(JSTraceable, HeapSizeOf)] #[derive(JSTraceable, HeapSizeOf)]
#[must_root] #[must_root]
@ -123,24 +112,6 @@ impl DocumentLoader {
self.blocking_loads.push(load); self.blocking_loads.push(load);
} }
/// Create and initiate a new network request.
pub fn load_async(&mut self,
load: LoadType,
listener: AsyncResponseTarget,
referrer: &Document,
referrer_policy: Option<ReferrerPolicy>) {
let context = load.to_load_context();
let url = load.url().clone();
self.add_blocking_load(load);
load_async(context,
self.resource_threads.sender(),
url,
self.pipeline,
referrer_policy.or(referrer.get_referrer_policy()),
Some(referrer.url().clone()),
listener);
}
/// Initiate a new fetch. /// Initiate a new fetch.
pub fn fetch_async(&mut self, pub fn fetch_async(&mut self,
load: LoadType, load: LoadType,

7
components/script/dom/document.rs
View file

@ -97,7 +97,7 @@ use js::jsapi::JS_GetRuntime;
use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER}; use msg::constellation_msg::{ALT, CONTROL, SHIFT, SUPER};
use msg::constellation_msg::{Key, KeyModifiers, KeyState}; use msg::constellation_msg::{Key, KeyModifiers, KeyState};
use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use msg::constellation_msg::{PipelineId, ReferrerPolicy};
use net_traits::{AsyncResponseTarget, FetchResponseMsg, IpcSend}; use net_traits::{FetchResponseMsg, IpcSend};
use net_traits::CookieSource::NonHTTP; use net_traits::CookieSource::NonHTTP;
use net_traits::CoreResourceMsg::{GetCookiesForUrl, SetCookiesForUrl}; use net_traits::CoreResourceMsg::{GetCookiesForUrl, SetCookiesForUrl};
use net_traits::request::RequestInit; use net_traits::request::RequestInit;
@ -1472,11 +1472,6 @@ impl Document {
ReflowReason::RequestAnimationFrame); ReflowReason::RequestAnimationFrame);
} }
pub fn load_async(&self, load: LoadType, listener: AsyncResponseTarget, referrer_policy: Option<ReferrerPolicy>) {
let mut loader = self.loader.borrow_mut();
loader.load_async(load, listener, self, referrer_policy);
}
pub fn fetch_async(&self, load: LoadType, pub fn fetch_async(&self, load: LoadType,
request: RequestInit, request: RequestInit,
fetch_target: IpcSender<FetchResponseMsg>) { fetch_target: IpcSender<FetchResponseMsg>) {