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

Responding to review comments

Browse source
This commit is contained in:
Alan Jeffrey 2019-09-11 12:13:41 -05:00
parent 49a5e84fb1
commit 2e6f14ffea
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script/dom/servoparser/prefetch.rs
View file

@ -50,7 +50,8 @@ impl Tokenizer {
let sink = PrefetchSink { let sink = PrefetchSink {
origin: document.origin().immutable().clone(), origin: document.origin().immutable().clone(),
pipeline_id: document.global().pipeline_id(), pipeline_id: document.global().pipeline_id(),
base: document.url(), base_url: None,
document_url: document.url(),
referrer: Referrer::ReferrerUrl(document.url()), referrer: Referrer::ReferrerUrl(document.url()),
referrer_policy: document.get_referrer_policy(), referrer_policy: document.get_referrer_policy(),
resource_threads: document.loader().resource_threads().clone(), resource_threads: document.loader().resource_threads().clone(),
@ -73,7 +74,8 @@ impl Tokenizer {
struct PrefetchSink { struct PrefetchSink {
origin: ImmutableOrigin, origin: ImmutableOrigin,
pipeline_id: PipelineId, pipeline_id: PipelineId,
base: ServoUrl, document_url: ServoUrl,
base_url: Option<ServoUrl>,
referrer: Referrer, referrer: Referrer,
referrer_policy: Option<ReferrerPolicy>, referrer_policy: Option<ReferrerPolicy>,
resource_threads: ResourceThreads, resource_threads: ResourceThreads,
@ -166,8 +168,10 @@ impl TokenSink for PrefetchSink {
}, },
(TagKind::StartTag, local_name!("base")) => { (TagKind::StartTag, local_name!("base")) => {
if let Some(url) = self.get_url(tag, local_name!("href")) { if let Some(url) = self.get_url(tag, local_name!("href")) {
debug!("Setting base {}", url); if self.base_url.is_none() {
self.base = url; debug!("Setting base {}", url);
self.base_url = Some(url);
}
} }
TokenSinkResult::Continue TokenSinkResult::Continue
}, },
@ -182,8 +186,9 @@ impl PrefetchSink {
} }
fn get_url(&self, tag: &Tag, name: LocalName) -> Option<ServoUrl> { fn get_url(&self, tag: &Tag, name: LocalName) -> Option<ServoUrl> {
self.get_attr(tag, name) let attr = self.get_attr(tag, name)?;
.and_then(|attr| ServoUrl::parse_with_base(Some(&self.base), &attr.value).ok()) let base = self.base_url.as_ref().unwrap_or(&self.document_url);
ServoUrl::parse_with_base(Some(base), &attr.value).ok()
} }
fn get_cors_settings(&self, tag: &Tag, name: LocalName) -> Option<CorsSettings> { fn get_cors_settings(&self, tag: &Tag, name: LocalName) -> Option<CorsSettings> {