diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 17:10:07 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:43 +0100 |
| commit | 92451d3c3cebc17dfa2908de5836d2dae50d4a42 (patch) | |
| tree | a1928379089f64399420a8e6f2cc4a9c52b08337 /WebCore/loader/CachedImage.cpp | |
| parent | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (diff) | |
| download | external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.zip external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.gz external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.bz2 | |
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
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); } |