diff options
| -rw-r--r-- | WebCore/loader/CachedImage.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp index 1105f66..dd93041 100644 --- a/WebCore/loader/CachedImage.cpp +++ b/WebCore/loader/CachedImage.cpp @@ -85,12 +85,8 @@ void CachedImage::load(DocLoader* docLoader) if (!docLoader || (docLoader->autoLoadImages() && !docLoader->shouldBlockNetworkImage(m_url))) #else if (!docLoader || docLoader->autoLoadImages()) -<<<<<<< HEAD #endif - CachedResource::load(docLoader, true, false, true); -======= CachedResource::load(docLoader, true, DoSecurityCheck, true); ->>>>>>> webkit.org at r54127 else m_loading = false; } |