Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23372 - sreeise:xhr_resource_url, r=jdm

Browse source 
Change XHRContext and resource timing information to use request URL

<!-- Please describe your changes on the following line: -->
Change resource timing information to return the URL used to create the XHR and store the URL in XHRContext.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #23329 (GitHub issue number if applicable)

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/23372)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-02 22:48:25 -04:00 • committed by GitHub
commit 7f7eead3d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/xmlhttprequest.rs
View file

@ -98,6 +98,7 @@ struct XHRContext {
gen_id: GenerationId, gen_id: GenerationId,
sync_status: DomRefCell<Option<ErrorResult>>, sync_status: DomRefCell<Option<ErrorResult>>,
resource_timing: ResourceFetchTiming, resource_timing: ResourceFetchTiming,
url: ServoUrl,
} }
#[derive(Clone)] #[derive(Clone)]
@ -284,10 +285,7 @@ impl XMLHttpRequest {
impl ResourceTimingListener for XHRContext { impl ResourceTimingListener for XHRContext {
fn resource_timing_information(&self) -> (InitiatorType, ServoUrl) { fn resource_timing_information(&self) -> (InitiatorType, ServoUrl) {
( (InitiatorType::XMLHttpRequest, self.url.clone())
InitiatorType::XMLHttpRequest,
self.resource_timing_global().get_url().clone(),
)
} }
fn resource_timing_global(&self) -> DomRoot<GlobalScope> { fn resource_timing_global(&self) -> DomRoot<GlobalScope> {
@ -1466,6 +1464,7 @@ impl XMLHttpRequest {
gen_id: self.generation_id.get(), gen_id: self.generation_id.get(),
sync_status: DomRefCell::new(None), sync_status: DomRefCell::new(None),
resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource), resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource),
url: init.url.clone(),
})); }));
let (task_source, script_port) = if self.sync.get() { let (task_source, script_port) = if self.sync.get() {

34
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -1,5 +1,11 @@
{ {
"items": { "items": {
"conformancechecker": {
"mozilla/xmlhttprequest_url.html": []
},
"manual": {
"mozilla/xmlhttprequest_url.html": []
},
"reftest": { "reftest": {
"css/abs-overflow-stackingcontext.html": [ "css/abs-overflow-stackingcontext.html": [
[ [
@ -7624,7 +7630,8 @@
], ],
{} {}
] ]
] ],
"mozilla/xmlhttprequest_url.html": []
}, },
"reftest_node": { "reftest_node": {
"css/border_black_groove.html": [ "css/border_black_groove.html": [
@ -7638,7 +7645,11 @@
], ],
{} {}
] ]
] ],
"mozilla/xmlhttprequest_url.html": []
},
"stub": {
"mozilla/xmlhttprequest_url.html": []
}, },
"support": { "support": {
".gitignore": [ ".gitignore": [
@ -11210,7 +11221,8 @@
[ [
{} {}
] ]
] ],
"mozilla/xmlhttprequest_url.html": []
}, },
"testharness": { "testharness": {
"bluetooth/advertisingEvent/watchAdvertisements-succeeds.html": [ "bluetooth/advertisingEvent/watchAdvertisements-succeeds.html": [
@ -13909,7 +13921,19 @@
"mozilla/worklets/test_worklet.html", "mozilla/worklets/test_worklet.html",
{} {}
] ]
],
"mozilla/xmlhttprequest_url.html": [
[
"mozilla/xmlhttprequest_url.html",
{}
]
] ]
},
"visual": {
"mozilla/xmlhttprequest_url.html": []
},
"wdspec": {
"mozilla/xmlhttprequest_url.html": []
} }
}, },
"paths": { "paths": {
@ -21084,6 +21108,10 @@
"mozilla/worklets/throw_exception.js": [ "mozilla/worklets/throw_exception.js": [
"6ca4f80fc2728c00848bb4474b62fa3596ed2f18", "6ca4f80fc2728c00848bb4474b62fa3596ed2f18",
"support" "support"
],
"mozilla/xmlhttprequest_url.html": [
"e5d10f27c06e1febd3bb70f8f128194fc3f63861",
"testharness"
] ]
}, },
"url_base": "/_mozilla/", "url_base": "/_mozilla/",

26
tests/wpt/mozilla/tests/mozilla/xmlhttprequest_url.html Normal file
View file

@ -0,0 +1,26 @@
<!doctype html>
<meta charset="utf-8">
<title>XMLHttpRequest Origin</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
function resolve(path) {
let a = document.createElement("a");
a.href = path;
return a.href;
}
async_test(function(t) {
let href = window.location.href;
let request = new XMLHttpRequest();
let url = resolve("./test.txt");
request.open('GET', url, true);
request.send();
request.onload = t.step_func_done(function() {
let entries = window.performance.getEntriesByType("resource");
assert_equals(entries.length, 1);
assert_equals(entries[0].name, href);
});
}, "Performance entries should contain the URL where the XMLHttpRequest originated");
</script>