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

Auto merge of #13422 - SecurityInsanity:master, r=KiChjang

Browse source 
Make Assign throw error on invalid url

Step 2 of: https://html.spec.whatwg.org/multipage/browsers.html#dom-location-assign says we should throw an error. This makes it do that.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #13420  (github issue number if applicable).
- [x] There are tests for these changes

<!-- 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/13422)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-27 01:24:28 -05:00 • committed by GitHub
commit ef1b594f48
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/location.rs
View file

@ -4,6 +4,7 @@
use dom::bindings::codegen::Bindings::LocationBinding; use dom::bindings::codegen::Bindings::LocationBinding;
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods; use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::error::{Error, ErrorResult};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, Root};
use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::bindings::reflector::{Reflector, reflect_dom_object};
@ -46,12 +47,15 @@ impl Location {
impl LocationMethods for Location { impl LocationMethods for Location {
// https://html.spec.whatwg.org/multipage/#dom-location-assign // https://html.spec.whatwg.org/multipage/#dom-location-assign
fn Assign(&self, url: USVString) { fn Assign(&self, url: USVString) -> ErrorResult {
// TODO: per spec, we should use the _API base URL_ specified by the // TODO: per spec, we should use the _API base URL_ specified by the
// _entry settings object_. // _entry settings object_.
let base_url = self.window.get_url(); let base_url = self.window.get_url();
if let Ok(url) = base_url.join(&url.0) { if let Ok(url) = base_url.join(&url.0) {
self.window.load_url(url, false, None); self.window.load_url(url, false, None);
Ok(())
} else {
Err(Error::Syntax)
} }
} }

1
components/script/dom/webidls/Location.webidl
View file

@ -14,6 +14,7 @@
attribute USVString search; attribute USVString search;
attribute USVString hash; attribute USVString hash;
[Throws]
void assign(USVString url); void assign(USVString url);
//void replace(USVString url); //void replace(USVString url);
void reload(); void reload();

4
tests/wpt/metadata/html/browsers/history/the-location-interface/location_assign.html.ini
View file

@ -2,7 +2,3 @@
type: testharness type: testharness
[location assign] [location assign]
expected: FAIL expected: FAIL
[URL that fails to parse]
expected: FAIL