Use fetch infrastructure to load external scripts #12472

KiChjang · 2016-07-16T15:18:40Z

Fixes #9186.

This change is

highfive · 2016-07-16T15:18:44Z

Heads up! This PR modifies the following files:

@KiChjang: components/script/dom/document.rs, components/net/resource_thread.rs, components/script/dom/webidls/HTMLScriptElement.webidl, components/script/dom/xmlhttprequest.rs, components/net_traits/lib.rs, components/net_traits/lib.rs, components/script/dom/htmlscriptelement.rs, components/net_traits/request.rs, components/net_traits/request.rs

highfive · 2016-07-16T15:18:45Z

Warning

These commits modify net and script code, but no tests are modified. Please consider adding a test!

KiChjang · 2016-07-16T15:21:15Z

@bors-servo try

bors-servo · 2016-07-16T15:21:17Z

⌛ Trying commit b6a5ac6 with merge f4639fd...

@Ms2ger

Make text decorations have the same color as the text if no shadows are present Fixes #9186. r? @Ms2ger  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12472)

jdm · 2016-07-16T15:39:19Z

That's a weird PR title.

bors-servo · 2016-07-16T16:22:22Z

💔 Test failed - mac-rel-css

KiChjang · 2016-07-16T16:46:33Z

@bors-servo try

bors-servo · 2016-07-16T16:46:35Z

⌛ Trying commit de36d2c with merge f33b18b...

@Ms2ger

Use fetch infrastructure to load external scripts Fixes #9186. r? @Ms2ger  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12472)

bors-servo · 2016-07-16T17:47:27Z

💔 Test failed - mac-rel-css

KiChjang · 2016-07-16T18:17:14Z

@bors-servo try

bors-servo · 2016-07-16T18:17:16Z

⌛ Trying commit a51bb00 with merge 6291e1b...

@Ms2ger

Use fetch infrastructure to load external scripts Fixes #9186. r? @Ms2ger  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12472)

bors-servo · 2016-07-16T18:43:42Z

💔 Test failed - mac-rel-wpt

KiChjang · 2016-07-16T18:57:32Z

Huh, looks like there's a lot more infrastructure to work on.

KiChjang · 2016-07-16T19:47:05Z

@bors-servo try

KiChjang · 2016-09-21T18:51:04Z

@bors-servo try

bors-servo · 2016-09-21T18:51:06Z

⌛ Trying commit 31e51a9 with merge 2ef1856...

Use fetch infrastructure to load external scripts Fixes #9186.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12472)

bors-servo · 2016-09-21T20:05:10Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

jdm · 2016-09-21T20:42:12Z

components/net_traits/response.rs

        };

-        if self.is_network_error() {
-            return Err(NetworkError::Internal("Cannot extract metadata from network error".to_string()));
+        if let Some(ref mut m) = metadata {


Let's move the initialization into the appropriate if let block earlier.

jdm · 2016-09-21T20:42:35Z

components/net_traits/response.rs

-            Metadata::default(url.clone())
+            Some(Metadata::default(url.clone()))
+        } else if self.is_network_error() {
+            return Err(NetworkError::Internal("Cannot extract metadata from network error".to_owned()));


Let's have a separate if block for this check before we check self.url.

jdm · 2016-09-21T20:45:29Z

components/net_traits/response.rs

+        } else {
+            match metadata {
+                Some(m) => Ok(FetchMetadata::Unfiltered(m)),
+                None => Err(NetworkError::Internal("No url found in response".to_owned()))


I would rather make this an unreachable!(), because we shouldn't be able to have a URL-less response with no internal response.

KiChjang · 2016-09-21T21:27:00Z

Comments addressed.

jdm · 2016-09-21T23:02:33Z

@bors-servo: r+

bors-servo · 2016-09-21T23:02:33Z

📌 Commit 6fbd2aa has been approved by jdm

bors-servo · 2016-09-21T23:49:34Z

⌛ Testing commit 6fbd2aa with merge f357afc...

Use fetch infrastructure to load external scripts Fixes #9186.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12472)

bors-servo · 2016-09-22T00:59:49Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

highfive assigned Ms2ger Jul 16, 2016

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 16, 2016

KiChjang changed the title ~~Make text decorations have the same color as the text if no shadows are present~~ Use fetch infrastructure to load external scripts Jul 16, 2016

KiChjang changed the title ~~Use fetch infrastructure to load external scripts~~ Use fetch infrastructure to load external scripts Jul 16, 2016

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

KiChjang force-pushed the use-fetch-in-script branch from b6a5ac6 to de36d2c Compare July 16, 2016 16:46

highfive removed the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

KiChjang force-pushed the use-fetch-in-script branch from de36d2c to a51bb00 Compare July 16, 2016 18:15

highfive removed the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

KiChjang force-pushed the use-fetch-in-script branch from a51bb00 to 9208353 Compare July 16, 2016 19:46

highfive removed the S-tests-failed The changes caused existing tests to fail. label Jul 16, 2016

KiChjang added 3 commits September 21, 2016 11:50

Implement default values for RequestInit

2bb9598

Add fetch_async to PendingAsyncLoad, DocumentLoader and Document

d481676

Use fetch infrastructure to load external scripts

4dcf693

KiChjang force-pushed the use-fetch-in-script branch from 6fa5654 to 31e51a9 Compare September 21, 2016 18:50

KiChjang removed the S-needs-rebase There are merge conflict errors. label Sep 21, 2016

jdm requested changes Sep 21, 2016

View reviewed changes

jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 21, 2016

KiChjang force-pushed the use-fetch-in-script branch from 31e51a9 to 4f67cd8 Compare September 21, 2016 21:21

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Sep 21, 2016

KiChjang force-pushed the use-fetch-in-script branch from 4f67cd8 to 2b2ac45 Compare September 21, 2016 21:23

KiChjang added 2 commits September 21, 2016 14:26

Add FetchMetadata and update corresponding methods

07c9cfe

Avoid deadlock in main_fetch

6fbd2aa

KiChjang force-pushed the use-fetch-in-script branch from 2b2ac45 to 6fbd2aa Compare September 21, 2016 21:26

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 21, 2016

bors-servo merged commit 6fbd2aa into servo:master Sep 22, 2016

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 22, 2016

KiChjang deleted the use-fetch-in-script branch September 22, 2016 01:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use fetch infrastructure to load external scripts #12472

Use fetch infrastructure to load external scripts #12472

KiChjang commented Jul 16, 2016 •

edited by Ms2ger

highfive commented Jul 16, 2016

highfive commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

jdm commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

KiChjang commented Jul 16, 2016

KiChjang commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 21, 2016

jdm Sep 21, 2016

jdm Sep 21, 2016

jdm Sep 21, 2016

KiChjang commented Sep 21, 2016

jdm commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 22, 2016

Use fetch infrastructure to load external scripts #12472

Use fetch infrastructure to load external scripts #12472

Conversation

KiChjang commented Jul 16, 2016 • edited by Ms2ger

highfive commented Jul 16, 2016

highfive commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

jdm commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

bors-servo commented Jul 16, 2016

bors-servo commented Jul 16, 2016

KiChjang commented Jul 16, 2016

KiChjang commented Jul 16, 2016

KiChjang commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 21, 2016

jdm Sep 21, 2016

Choose a reason for hiding this comment

jdm Sep 21, 2016

Choose a reason for hiding this comment

jdm Sep 21, 2016

Choose a reason for hiding this comment

KiChjang commented Sep 21, 2016

jdm commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 21, 2016

bors-servo commented Sep 22, 2016

KiChjang commented Jul 16, 2016 •

edited by Ms2ger