diff options
Diffstat (limited to 'WebCore/loader/CachedImage.cpp')
| -rw-r--r-- | WebCore/loader/CachedImage.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp index 4dd8ea3..908c425 100644 --- a/WebCore/loader/CachedImage.cpp +++ b/WebCore/loader/CachedImage.cpp @@ -82,17 +82,12 @@ void CachedImage::decodedDataDeletionTimerFired(Timer<CachedImage>*) void CachedImage::load(CachedResourceLoader* cachedResourceLoader) { -<<<<<<< HEAD #ifdef ANDROID_BLOCK_NETWORK_IMAGE - if (!docLoader || (docLoader->autoLoadImages() && !docLoader->shouldBlockNetworkImage(m_url))) + if (!cachedResourceLoader || (cachedResourceLoader->autoLoadImages() && !cachedResourceLoader->shouldBlockNetworkImage(m_url))) #else - if (!docLoader || docLoader->autoLoadImages()) -#endif - CachedResource::load(docLoader, true, DoSecurityCheck, true); -======= if (!cachedResourceLoader || cachedResourceLoader->autoLoadImages()) +#endif CachedResource::load(cachedResourceLoader, true, DoSecurityCheck, true); ->>>>>>> webkit.org at r67178 else setLoading(false); } |