Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NET...

See http://trac.webkit.org/changeset/52177

Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42

diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp
index 1105f66..dd93041 100644 (file)
--- 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;
 }