Changeset 220760 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Aug 15, 2017, 2:15:09 PM (8 years ago)

Author:

Chris Dumez

Message:

Update CachedResourceLoader::requestResource() to return a WTF::Expected
​https://bugs.webkit.org/show_bug.cgi?id=175505

Reviewed by Youenn Fablet.

Update CachedResourceLoader::requestResource() to return a WTF::Expected
type instead of using an out parameter for the ResourceError in case of
synchronous failure.

• Modules/beacon/NavigatorBeacon.cpp:

(WebCore::NavigatorBeacon::sendBeacon):

• bindings/js/CachedScriptFetcher.cpp:

(WebCore::CachedScriptFetcher::requestScriptWithCache const):

• css/CSSFontFaceSrcValue.cpp:

(WebCore::CSSFontFaceSrcValue::cachedFont):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::loadBestFitImage):

• css/CSSImageValue.cpp:

(WebCore::CSSImageValue::loadImage):

• css/StyleRuleImport.cpp:

(WebCore::StyleRuleImport::requestStyleSheet):

• dom/ProcessingInstruction.cpp:

(WebCore::ProcessingInstruction::checkStyleSheet):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::process):

• loader/CrossOriginPreflightChecker.cpp:

(WebCore::CrossOriginPreflightChecker::startPreflight):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::startLoadingMainResource):

• loader/DocumentThreadableLoader.cpp:

(WebCore::DocumentThreadableLoader::loadRequest):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadedResourceFromMemoryCache):

• loader/FrameLoader.h:
• loader/ImageLoader.cpp:

(WebCore::ImageLoader::updateFromElement):

• loader/LinkLoader.cpp:

(WebCore::LinkLoader::preloadIfNeeded):

• loader/MediaResourceLoader.cpp:

(WebCore::MediaResourceLoader::requestResource):

• loader/TextTrackLoader.cpp:

(WebCore::TextTrackLoader::load):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::castCachedResourceTo):
(WebCore::CachedResourceLoader::requestImage):
(WebCore::CachedResourceLoader::requestFont):
(WebCore::CachedResourceLoader::requestTextTrack):
(WebCore::CachedResourceLoader::requestCSSStyleSheet):
(WebCore::CachedResourceLoader::requestUserCSSStyleSheet):
(WebCore::CachedResourceLoader::requestScript):
(WebCore::CachedResourceLoader::requestXSLStyleSheet):
(WebCore::CachedResourceLoader::requestSVGDocument):
(WebCore::CachedResourceLoader::requestLinkResource):
(WebCore::CachedResourceLoader::requestMedia):
(WebCore::CachedResourceLoader::requestIcon):
(WebCore::CachedResourceLoader::requestRawResource):
(WebCore::CachedResourceLoader::requestBeaconResource):
(WebCore::CachedResourceLoader::requestMainResource):
(WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::preload):

• loader/cache/CachedResourceLoader.h:
• loader/cache/CachedSVGDocumentReference.cpp:

(WebCore::CachedSVGDocumentReference::load):

• loader/icon/IconLoader.cpp:

(WebCore::IconLoader::startLoading):

• platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm:

(WebCore::WebCoreAVFResourceLoader::startLoading):

• svg/SVGFEImageElement.cpp:

(WebCore::SVGFEImageElement::requestImageResource):

• svg/SVGFontFaceUriElement.cpp:

(WebCore::SVGFontFaceUriElement::loadFont):

• svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::updateExternalDocument):

• xml/XSLImportRule.cpp:

(WebCore::XSLImportRule::loadSheet):

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -106 +106 @@
             request.updateForAccessControl(*document);
 
-        m_cachedImage = loader.requestImage(WTFMove(request));
+        m_cachedImage = loader.requestImage(WTFMove(request)).valueOr(nullptr);
         m_bestFitImageScaleFactor = image.scaleFactor;
     }