diff options
| -rw-r--r-- | components/net_traits/blob_url_store.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/eventsource.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/htmlanchorelement.rs | 2 | ||||
| -rw-r--r-- | components/url/origin.rs | 5 | ||||
| -rw-r--r-- | tests/wpt/metadata/eventsource/eventsource-cross-origin.htm.ini | 9 | ||||
| -rw-r--r-- | tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini | 9 | ||||
| -rw-r--r-- | tests/wpt/metadata/url/a-element-origin.html.ini | 9 |
7 files changed, 3 insertions, 35 deletions
diff --git a/components/net_traits/blob_url_store.rs b/components/net_traits/blob_url_store.rs index b35134bd78c..b3873c945ba 100644 --- a/components/net_traits/blob_url_store.rs +++ b/components/net_traits/blob_url_store.rs @@ -57,6 +57,6 @@ pub fn get_blob_origin(url: &ServoUrl) -> FileOrigin { // NOTE: by default this is "null" (Opaque), which is not ideal "file://".to_string() } else { - url.origin().unicode_serialization() + url.origin().ascii_serialization() } } diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 574b39e0623..7aad98406a4 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -340,7 +340,7 @@ impl FetchResponseListener for EventSourceContext { None => self.fail_the_connection(), Some(ct) => match ct.into_inner().0 { Mime(TopLevel::Text, SubLevel::EventStream, _) => { - self.origin = meta.final_url.origin().unicode_serialization(); + self.origin = meta.final_url.origin().ascii_serialization(); self.announce_the_connection(); }, _ => self.fail_the_connection(), diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index f813a4026f4..a5d70ad9e3d 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -319,7 +319,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement { }, Some(ref url) => { // Step 3. - url.origin().unicode_serialization() + url.origin().ascii_serialization() }, }) } diff --git a/components/url/origin.rs b/components/url/origin.rs index 414f03ec6a7..9d1ef7e08f3 100644 --- a/components/url/origin.rs +++ b/components/url/origin.rs @@ -89,11 +89,6 @@ impl ImmutableOrigin { pub fn ascii_serialization(&self) -> String { self.clone().into_url_origin().ascii_serialization() } - - /// <https://html.spec.whatwg.org/multipage/#unicode-serialisation-of-an-origin> - pub fn unicode_serialization(&self) -> String { - self.clone().into_url_origin().unicode_serialization() - } } /// Opaque identifier for URLs that have file or other schemes diff --git a/tests/wpt/metadata/eventsource/eventsource-cross-origin.htm.ini b/tests/wpt/metadata/eventsource/eventsource-cross-origin.htm.ini index aa875978e72..3983756582e 100644 --- a/tests/wpt/metadata/eventsource/eventsource-cross-origin.htm.ini +++ b/tests/wpt/metadata/eventsource/eventsource-cross-origin.htm.ini @@ -9,12 +9,3 @@ [EventSource: cross-origin No allow-origin should fail] expected: FAIL - [EventSource: cross-origin basic use] - expected: FAIL - - [EventSource: cross-origin redirect use] - expected: FAIL - - [EventSource: cross-origin redirect use recon] - expected: FAIL - diff --git a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini index 4494364e027..21b2a4a5d2c 100644 --- a/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini +++ b/tests/wpt/metadata/url/a-element-origin-xhtml.xhtml.ini @@ -6,12 +6,3 @@ [Parsing origin: <https://faß.ExAmPlE/> against <about:blank>] expected: FAIL - [Parsing origin: <http://你好你好> against <http://other.com/>] - expected: FAIL - - [Parsing origin: <ftp://%e2%98%83> against <about:blank>] - expected: FAIL - - [Parsing origin: <https://%e2%98%83> against <about:blank>] - expected: FAIL - diff --git a/tests/wpt/metadata/url/a-element-origin.html.ini b/tests/wpt/metadata/url/a-element-origin.html.ini index 9b5b4a3200e..c4f8964312b 100644 --- a/tests/wpt/metadata/url/a-element-origin.html.ini +++ b/tests/wpt/metadata/url/a-element-origin.html.ini @@ -6,12 +6,3 @@ [Parsing origin: <https://faß.ExAmPlE/> against <about:blank>] expected: FAIL - [Parsing origin: <http://你好你好> against <http://other.com/>] - expected: FAIL - - [Parsing origin: <ftp://%e2%98%83> against <about:blank>] - expected: FAIL - - [Parsing origin: <https://%e2%98%83> against <about:blank>] - expected: FAIL - |