aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/servoparser/prefetch.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-10-23 13:38:31 -0400
committerGitHub <noreply@github.com>2019-10-23 13:38:31 -0400
commitddc7a37531e0cb173817c5afac0330f374ffdd97 (patch)
tree49a88fd3b94976139625e05057aeade760f1bb77 /components/script/dom/servoparser/prefetch.rs
parente26530341bdd3bfdaf40ba0e9f6cc1460732bc9e (diff)
parent785a344e32db58d4e631fd3cae17fd1f29a721ab (diff)
downloadservo-ddc7a37531e0cb173817c5afac0330f374ffdd97.tar.gz
servo-ddc7a37531e0cb173817c5afac0330f374ffdd97.zip
Auto merge of #24523 - servo:rand, r=jdm,nox
Update rand to 0.7 (fixes #24448)
Diffstat (limited to 'components/script/dom/servoparser/prefetch.rs')
-rw-r--r--components/script/dom/servoparser/prefetch.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/servoparser/prefetch.rs b/components/script/dom/servoparser/prefetch.rs
index 716be8b0f51..906c9352771 100644
--- a/components/script/dom/servoparser/prefetch.rs
+++ b/components/script/dom/servoparser/prefetch.rs
@@ -97,7 +97,7 @@ impl TokenSink for PrefetchSink {
_ => return TokenSinkResult::Continue,
};
match (tag.kind, &tag.name) {
- (TagKind::StartTag, local_name!("script")) if self.prefetching => {
+ (TagKind::StartTag, &local_name!("script")) if self.prefetching => {
if let Some(url) = self.get_url(tag, local_name!("src")) {
debug!("Prefetch script {}", url);
let cors_setting = self.get_cors_settings(tag, local_name!("crossorigin"));
@@ -120,7 +120,7 @@ impl TokenSink for PrefetchSink {
}
TokenSinkResult::RawData(RawKind::ScriptData)
},
- (TagKind::StartTag, local_name!("img")) if self.prefetching => {
+ (TagKind::StartTag, &local_name!("img")) if self.prefetching => {
if let Some(url) = self.get_url(tag, local_name!("src")) {
debug!("Prefetch {} {}", tag.name, url);
let request = image_fetch_request(
@@ -137,7 +137,7 @@ impl TokenSink for PrefetchSink {
}
TokenSinkResult::Continue
},
- (TagKind::StartTag, local_name!("link")) if self.prefetching => {
+ (TagKind::StartTag, &local_name!("link")) if self.prefetching => {
if let Some(rel) = self.get_attr(tag, local_name!("rel")) {
if rel.value.eq_ignore_ascii_case("stylesheet") {
if let Some(url) = self.get_url(tag, local_name!("href")) {
@@ -167,15 +167,15 @@ impl TokenSink for PrefetchSink {
}
TokenSinkResult::Continue
},
- (TagKind::StartTag, local_name!("script")) => {
+ (TagKind::StartTag, &local_name!("script")) => {
TokenSinkResult::RawData(RawKind::ScriptData)
},
- (TagKind::EndTag, local_name!("script")) => {
+ (TagKind::EndTag, &local_name!("script")) => {
// After the first script tag, the main parser is blocked, so it's worth prefetching.
self.prefetching = true;
TokenSinkResult::Script(PrefetchHandle)
},
- (TagKind::StartTag, local_name!("base")) => {
+ (TagKind::StartTag, &local_name!("base")) => {
if let Some(url) = self.get_url(tag, local_name!("href")) {
if self.base_url.is_none() {
debug!("Setting base {}", url);