diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 17:43:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:31 +0100 |
| commit | 21be8434216831fd90f4e73dcd6ffdafed65f6b0 (patch) | |
| tree | 0acdf29e4782d90ffdab313b48922d028c4aae47 /WebCore | |
| parent | 9628e2bda7f58eb73bddf403fddc498c1b97ccac (diff) | |
| download | external_webkit-21be8434216831fd90f4e73dcd6ffdafed65f6b0.zip external_webkit-21be8434216831fd90f4e73dcd6ffdafed65f6b0.tar.gz external_webkit-21be8434216831fd90f4e73dcd6ffdafed65f6b0.tar.bz2 | |
Merge WebKit at r74534: Fix CachedResourceLoader.cpp
Make upstream changes in our code.
See http://trac.webkit.org/changeset/73749
Change-Id: I6764c637cf0c7ed0bf0dabde47488b95c1fa7062
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/loader/cache/CachedResourceLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/loader/cache/CachedResourceLoader.cpp b/WebCore/loader/cache/CachedResourceLoader.cpp index 903c633..60f9810 100644 --- 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); } } } |