From 92451d3c3cebc17dfa2908de5836d2dae50d4a42 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 13 Sep 2010 17:10:07 +0100 Subject: Merge WebKit at r67178 : Fix conflicts. V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45 --- WebCore/loader/CachedImage.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'WebCore/loader/CachedImage.cpp') 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*) 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); } -- cgit v1.1