summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-12 09:13:00 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-16 09:58:26 +0000
commit03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch)
treecc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc
parentfa98118a45f7e169f8846086dc2c22c49a8ba310 (diff)
downloadqtwebengine-chromium-03561cae90f1d99b5c54b1ef3be69f10e882b25e.tar.gz
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc b/chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc
index f9d1021921c..b534f607409 100644
--- a/chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc
+++ b/chromium/third_party/blink/renderer/core/loader/resource/image_resource.cc
@@ -119,7 +119,7 @@ class ImageResource::ImageResourceInfoImpl final
const KURL& url,
const AtomicString& initiator_name) override {
fetcher->EmulateLoadStartedForInspector(
- resource_.Get(), url, mojom::RequestContextType::IMAGE,
+ resource_.Get(), url, mojom::blink::RequestContextType::IMAGE,
network::mojom::RequestDestination::kImage, initiator_name);
}
@@ -135,6 +135,12 @@ class ImageResource::ImageResourceInfoImpl final
return resource_->GetResourceRequest().IsAdResource();
}
+ const HashSet<String>* GetUnsupportedImageMimeTypes() const override {
+ if (!resource_->Options().unsupported_image_mime_types)
+ return nullptr;
+ return &resource_->Options().unsupported_image_mime_types->data;
+ }
+
const Member<ImageResource> resource_;
};
@@ -155,8 +161,8 @@ class ImageResource::ImageResourceFactory : public NonTextResourceFactory {
ImageResource* ImageResource::Fetch(FetchParameters& params,
ResourceFetcher* fetcher) {
if (params.GetResourceRequest().GetRequestContext() ==
- mojom::RequestContextType::UNSPECIFIED) {
- params.SetRequestContext(mojom::RequestContextType::IMAGE);
+ mojom::blink::RequestContextType::UNSPECIFIED) {
+ params.SetRequestContext(mojom::blink::RequestContextType::IMAGE);
params.SetRequestDestination(network::mojom::RequestDestination::kImage);
}