Add comments linking to the steps of the specs in the checks on Location setters #25714
+33
−37
add comments linking to steps of the specs
- Loading branch information
commit ad31fde3ef1203ba25047d4e9d2e134c1b764504
| @@ -165,7 +165,7 @@ impl LocationMethods for Location { | ||
| // https://html.spec.whatwg.org/multipage/#dom-location-host | ||
| fn SetHost(&self, value: USVString) -> ErrorResult { | ||
| self.check_same_origin_domain()?; | ||
| // If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
| // Step 4: If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
| if !self.get_url().cannot_be_a_base() { | ||
| self.set_url_component(value, UrlHelper::SetHost); | ||
| } | ||
| @@ -187,7 +187,7 @@ impl LocationMethods for Location { | ||
| // https://html.spec.whatwg.org/multipage/#dom-location-hostname | ||
| fn SetHostname(&self, value: USVString) -> ErrorResult { | ||
| self.check_same_origin_domain()?; | ||
| // If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
| // Step 4: If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
| if !self.get_url().cannot_be_a_base() { | ||
| self.set_url_component(value, UrlHelper::SetHostname); | ||
| } | ||
| @@ -222,7 +222,7 @@ impl LocationMethods for Location { | ||
| // https://html.spec.whatwg.org/multipage/#dom-location-pathname | ||
| fn SetPathname(&self, value: USVString) -> ErrorResult { | ||
| self.check_same_origin_domain()?; | ||
| // If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
| // Step 3: If copyURL's cannot-be-a-base-URL flag is set, terminate these steps. | ||
|
||
| if !self.get_url().cannot_be_a_base() { | ||
| self.set_url_component(value, UrlHelper::SetPathname); | ||
| } | ||
| @@ -239,7 +239,7 @@ impl LocationMethods for Location { | ||
| fn SetPort(&self, value: USVString) -> ErrorResult { | ||
| self.check_same_origin_domain()?; | ||
| let url = self.get_url(); | ||
| // If copyURL cannot have a username/password/port, then return. | ||
| // Step 4: If copyURL cannot have a username/password/port, then return. | ||
| // https://url.spec.whatwg.org/#cannot-have-a-username-password-port | ||
| if url.has_host() && !url.cannot_be_a_base() && url.scheme() != "file" { | ||
| self.set_url_component(value, UrlHelper::SetPort); | ||
| @@ -256,7 +256,7 @@ impl LocationMethods for Location { | ||
| // https://html.spec.whatwg.org/multipage/#dom-location-protocol | ||
| fn SetProtocol(&self, value: USVString) -> ErrorResult { | ||
| self.check_same_origin_domain()?; | ||
| // If copyURL's scheme is not an HTTP(S) scheme, then terminate these steps. | ||
| // Step 6: If copyURL's scheme is not an HTTP(S) scheme, then terminate these steps. | ||
| let scheme = value.split(':').next().unwrap(); | ||
|
||
| if scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https") { | ||
| self.set_url_component(value, UrlHelper::SetProtocol); | ||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Actually, can we put this comment, and all others, above the
Ok(())branch, because the comments all refer to the steps take when the condition is not met.