diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-16 13:16:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-16 13:16:44 -0400 |
commit | db7bb2a5101ea6042654b59b3b81725e2da65891 (patch) | |
tree | 8cffcf6ceba03fae689b8cbbf085bc62a579a97c /components/script | |
parent | 3a33f99cad1e80e1f1a3e12dd98cabd9c40aa246 (diff) | |
parent | 1cecb080b35af6035665310aec9a19294dbf3cc5 (diff) | |
download | servo-db7bb2a5101ea6042654b59b3b81725e2da65891.tar.gz servo-db7bb2a5101ea6042654b59b3b81725e2da65891.zip |
Auto merge of #23048 - c410-f3r:image-url, r=jdm
Add url for LayoutImageContext
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #23043
<!-- 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/23048)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/layout_image.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/layout_image.rs b/components/script/layout_image.rs index e47218cffda..01fe65a01d1 100644 --- a/components/script/layout_image.rs +++ b/components/script/layout_image.rs @@ -29,6 +29,7 @@ struct LayoutImageContext { cache: Arc<dyn ImageCache>, resource_timing: ResourceFetchTiming, doc: Trusted<Document>, + url: ServoUrl, } impl FetchResponseListener for LayoutImageContext { @@ -64,10 +65,7 @@ impl FetchResponseListener for LayoutImageContext { impl ResourceTimingListener for LayoutImageContext { fn resource_timing_information(&self) -> (InitiatorType, ServoUrl) { - ( - InitiatorType::Other, - self.resource_timing_global().get_url().clone(), - ) + (InitiatorType::Other, self.url.clone()) } fn resource_timing_global(&self) -> DomRoot<GlobalScope> { @@ -90,6 +88,7 @@ pub fn fetch_image_for_layout( cache: cache, resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource), doc: Trusted::new(&document), + url: url.clone(), })); let document = document_from_node(node); |