diff options
| author | Pu Xingyu <pu.stshine@gmail.com> | 2016-11-18 12:40:35 +0800 |
|---|---|---|
| committer | Pu Xingyu <pu.stshine@gmail.com> | 2016-11-20 06:30:10 +0800 |
| commit | 5287e708291770617fe75d4f8fd59593b84b80b1 (patch) | |
| tree | ee7eb39279cde0aee374946df543461025884c7c /components/script/dom | |
| parent | 91f3d4f4749a1dd53d665f741be85559b820cbe7 (diff) | |
| download | servo-5287e708291770617fe75d4f8fd59593b84b80b1.tar.gz servo-5287e708291770617fe75d4f8fd59593b84b80b1.zip | |
Minor fixes and update test expectations
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/document.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index fac64cbc965..7819c6e0d83 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -591,7 +591,7 @@ impl Document { // Step 6 .or_else(|| self.get_anchor_by_name(fragid)) // Step 7 - .or_else(|| if fragid.to_lowercase() == "top" { + .or_else(|| if fragid.eq_ignore_ascii_case("top") { self.GetDocumentElement() } else { // Step 8 @@ -607,7 +607,7 @@ impl Document { // Step 1 self.set_target_element(target.r()); - let point = if fragment.is_empty() || fragment.to_lowercase() == "top" { + let point = if fragment.is_empty() || fragment.eq_ignore_ascii_case("top") { // FIXME(stshine): this should be the origin of the stacking context space, // which may differ under the influence of writing mode. Some((0.0, 0.0)) diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index f2c7e48fbde..a57ed1061e9 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -1335,13 +1335,14 @@ impl Window { let referrer_policy = referrer_policy.or(doc.get_referrer_policy()); // https://html.spec.whatwg.org/multipage/#navigating-across-documents - if !force_reload && url.as_url().unwrap()[..Position::AfterQuery] == doc.url().as_url().unwrap()[..Position::AfterQuery] { - // Step 5 - if let Some(fragment) = url.fragment() { - doc.check_and_scroll_fragment(fragment); - doc.set_url(url.clone()); - return - } + if !force_reload && url.as_url().unwrap()[..Position::AfterQuery] == + doc.url().as_url().unwrap()[..Position::AfterQuery] { + // Step 5 + if let Some(fragment) = url.fragment() { + doc.check_and_scroll_fragment(fragment); + doc.set_url(url.clone()); + return + } } self.main_thread_script_chan().send( |