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

Timestamp:

Jan 27, 2015, 9:53:53 PM (10 years ago)

Author:

Chris Dumez

Message:

Use a Ref<CachedResourceLoader> in Document instead of a RefPtr
​https://bugs.webkit.org/show_bug.cgi?id=140971

Reviewed by Andreas Kling.

Source/WebCore:

Use a Ref<CachedResourceLoader> in Document instead of a RefPtr as it
can never be null. Also have Document::cachedResourceLoader() return a
reference instead of a pointer. This gets rid of a lot of unnecessary
null-checks.

Source/WebKit/win:

Use more references instead of pointers.

• WebDataSource.cpp:

(WebDataSource::subresourceForURL):

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -101 +101 @@
 }
 
-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader, const ResourceLoaderOptions& options)
-{
-    ASSERT(loader);
-
-    Document* document = loader->document();
+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
+{
+    Document* document = loader.document();
     if (Page* page = document->page())
         m_scaleFactor = page->deviceScaleFactor();
@@ -123 +121 @@
         if (options.requestOriginPolicy() == PotentiallyCrossOriginEnabled)
             updateRequestForAccessControl(request.mutableResourceRequest(), document->securityOrigin(), options.allowCredentials());
-        if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
+        if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
             detachPendingImage();
             m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);
@@ -133 +131 @@
 }
 
-StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* loader)
+StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader& loader)
 {
     return cachedImageSet(loader, CachedResourceLoader::defaultCachedResourceOptions());