Merge WebKit at r74534: Fix CachedResourceLoader.cpp

Make upstream changes in our code.

See http://trac.webkit.org/changeset/73749

Change-Id: I6764c637cf0c7ed0bf0dabde47488b95c1fa7062

diff --git a/WebCore/loader/cache/CachedResourceLoader.cpp b/WebCore/loader/cache/CachedResourceLoader.cpp
index 903c633..60f9810 100644 (file)
--- a/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -372,7 +372,7 @@ void CachedResourceLoader::setBlockNetworkImage(bool block)
         if (resource->type() == CachedResource::ImageResource) {
             CachedImage* image = const_cast<CachedImage*>(static_cast<const CachedImage*>(resource));
             if (image->stillNeedsLoad())
-                cache()->loader()->load(this, image, true);
+                load(image, true);
         }
     }
 }