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...


        Auto merge of #12472 - KiChjang:use-fetch-in-script, r=<try>

@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...


        Auto merge of #12472 - KiChjang:use-fetch-in-script, r=<try>

@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...


        Auto merge of #12472 - KiChjang:use-fetch-in-script, r=<try>

@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


        Implement default values for RequestInit


        Add fetch_async to PendingAsyncLoad, DocumentLoader and Document


        Use fetch infrastructure to load external scripts

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

@bors-servo try

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

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


        Auto merge of #12472 - KiChjang:use-fetch-in-script, r=<try>

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:47:41Z

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:47:41Z

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:47:41Z

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.


        Add FetchMetadata and update corresponding methods


        Avoid deadlock in main_fetch

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...


        Auto merge of #12472 - KiChjang:use-fetch-in-script, r=jdm

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 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 label Jul 16, 2016

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

highfive removed the S-tests-failed label Jul 16, 2016

highfive added the S-tests-failed label Jul 16, 2016

KiChjang force-pushed the KiChjang:use-fetch-in-script branch from de36d2c to a51bb00 Jul 16, 2016

highfive removed the S-tests-failed label Jul 16, 2016

highfive added the S-tests-failed label Jul 16, 2016

KiChjang force-pushed the KiChjang:use-fetch-in-script branch from a51bb00 to 9208353 Jul 16, 2016

highfive removed the S-tests-failed label Jul 16, 2016

KiChjang added 3 commits Jul 6, 2016

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 KiChjang:use-fetch-in-script branch from 6fa5654 to 31e51a9 Sep 21, 2016

KiChjang removed the S-needs-rebase label Sep 21, 2016

jdm requested changes Sep 21, 2016

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Sep 21, 2016

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

highfive added S-awaiting-review and removed S-needs-code-changes labels Sep 21, 2016

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

KiChjang added 2 commits Sep 14, 2016

Add FetchMetadata and update corresponding methods

07c9cfe

Avoid deadlock in main_fetch

Loading status checks…

6fbd2aa

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

highfive added S-awaiting-merge and removed S-awaiting-review labels Sep 21, 2016

bors-servo merged commit 6fbd2aa into servo:master Sep 22, 2016
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Sep 22, 2016

KiChjang deleted the KiChjang:use-fetch-in-script branch Sep 22, 2016

servo / servo

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

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

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

servo / servo

Join GitHub today

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

This comment has been minimized.

jdm Sep 21, 2016

This comment has been minimized.

jdm Sep 21, 2016

This comment has been minimized.

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

KiChjang commented Jul 16, 2016 •

edited by Ms2ger