diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-11 10:34:04 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 10:34:04 -0800 |
commit | cfc74e20603e7395a743b3b3c202db6db840da4d (patch) | |
tree | 317d85cfac2e0e1e66e6996f2365ebb4a4371a13 /components/script | |
parent | d1bc1a4f1b66ab9f63fa37f649eaf79035e12f8e (diff) | |
parent | cb9940faf3785d2867bcbd44363fff8bae928358 (diff) | |
download | servo-cfc74e20603e7395a743b3b3c202db6db840da4d.tar.gz servo-cfc74e20603e7395a743b3b3c202db6db840da4d.zip |
Auto merge of #14911 - charlesvdv:alternate-stylesheet, r=cbrewster
Handle properly alternate stylesheet
<!-- Please describe your changes on the following line: -->
Alternate stylesheet are now fetched and then desactivated instead of ignoring them.
I don't know if tests are required to check if the stylesheet is correctly loaded and disabled ?
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14881 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14911)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/htmllinkelement.rs | 24 | ||||
-rw-r--r-- | components/script/stylesheet_loader.rs | 3 |
2 files changed, 16 insertions, 11 deletions
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 24b4e779099..3466fa10dab 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -99,6 +99,17 @@ impl HTMLLinkElement { }) }) } + + pub fn is_alternate(&self) -> bool { + let rel = get_attr(self.upcast(), &local_name!("rel")); + match rel { + Some(ref value) => { + value.split(HTML_SPACE_CHARACTERS) + .any(|s| s.eq_ignore_ascii_case("alternate")) + }, + None => false, + } + } } fn get_attr(element: &Element, local_name: &LocalName) -> Option<String> { @@ -112,17 +123,8 @@ fn get_attr(element: &Element, local_name: &LocalName) -> Option<String> { fn string_is_stylesheet(value: &Option<String>) -> bool { match *value { Some(ref value) => { - let mut found_stylesheet = false; - for s in value.split(HTML_SPACE_CHARACTERS).into_iter() { - if s.eq_ignore_ascii_case("alternate") { - return false; - } - - if s.eq_ignore_ascii_case("stylesheet") { - found_stylesheet = true; - } - } - found_stylesheet + value.split(HTML_SPACE_CHARACTERS) + .any(|s| s.eq_ignore_ascii_case("stylesheet")) }, None => false, } diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index db70c9e8ebb..637f0619fc5 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -138,6 +138,9 @@ impl FetchResponseListener for StylesheetContext { Some(&loader), win.css_error_reporter(), ParserContextExtraData::default())); + if elem.downcast::<HTMLLinkElement>().unwrap().is_alternate() { + sheet.set_disabled(true); + } elem.downcast::<HTMLLinkElement>() .unwrap() .set_stylesheet(sheet.clone()); |