aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/url.rs
diff options
context:
space:
mode:
authorYutaro Ohno <yutaro.ono.418@gmail.com>2023-05-06 15:10:28 +0900
committerYutaro Ohno <yutaro.ono.418@gmail.com>2023-05-06 16:06:03 +0900
commit3336bf6cce3bc1caba1ff440e507097285b2eeb8 (patch)
tree4d07bb463f2a464c309f844ff4222849fbeefce8 /components/script/dom/url.rs
parentf29834608aee21c1845737067c16f92adfb77f08 (diff)
downloadservo-3336bf6cce3bc1caba1ff440e507097285b2eeb8.tar.gz
servo-3336bf6cce3bc1caba1ff440e507097285b2eeb8.zip
Update step numbers in URL constructor
Two commits have been made ahead of the current implementation of Servo's URL constructor: - Align with a more modern IDL definition style [1] - Add URL.canParse() [2] Since these commits don't alter the actual behavior, this commit only updates the step numbers and adds brief descriptions for each step. No behavior change is expected with this commit. [1]: https://github.com/whatwg/url/commit/ea3b75d333cbce91f73676ef2d21bcadb12b4419 [2]: https://github.com/whatwg/url/commit/ae3c28b84e3e7122c2807401c26b8a63cb2ab445 Signed-off-by: Yutaro Ohno <yutaro.ono.418@gmail.com>
Diffstat (limited to 'components/script/dom/url.rs')
-rw-r--r--components/script/dom/url.rs34
1 files changed, 17 insertions, 17 deletions
diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs
index c1533bec159..ecc7fb38591 100644
--- a/components/script/dom/url.rs
+++ b/components/script/dom/url.rs
@@ -77,38 +77,38 @@ impl URL {
url: USVString,
base: Option<USVString>,
) -> Fallible<DomRoot<URL>> {
+ // Step 1. Parse url with base.
let parsed_base = match base {
- None => {
- // Step 1.
- None
- },
- Some(base) =>
- // Step 2.1.
- {
+ None => None,
+ Some(base) => {
match ServoUrl::parse(&base.0) {
Ok(base) => Some(base),
Err(error) => {
- // Step 2.2.
+ // Step 2. Throw a TypeError if URL parsing fails.
return Err(Error::Type(format!("could not parse base: {}", error)));
},
}
},
};
- // Step 3.
let parsed_url = match ServoUrl::parse_with_base(parsed_base.as_ref(), &url.0) {
Ok(url) => url,
Err(error) => {
- // Step 4.
+ // Step 2. Throw a TypeError if URL parsing fails.
return Err(Error::Type(format!("could not parse URL: {}", error)));
},
};
- // Step 5: Skip (see step 8 below).
- // Steps 6-7.
- let result = URL::new(global, parsed_url);
- // Step 8: Instead of construcing a new `URLSearchParams` object here, construct it
- // on-demand inside `URL::SearchParams`.
- // Step 9.
- Ok(result)
+
+ // Skip the steps below.
+ // Instead of construcing a new `URLSearchParams` object here, construct it
+ // on-demand inside `URL::SearchParams`.
+ //
+ // Step 3. Let query be parsedURL’s query.
+ // Step 5. Set this’s query object to a new URLSearchParams object.
+ // Step 6. Initialize this’s query object with query.
+ // Step 7. Set this’s query object’s URL object to this.
+
+ // Step 4. Set this’s URL to parsedURL.
+ Ok(URL::new(global, parsed_url))
}
// https://url.spec.whatwg.org/#dom-url-canparse