diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:25:42 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:58 +0000 |
| commit | e080fc6aeb560dc0570348d955fe35c2639e312c (patch) | |
| tree | cd9bc9d622c36070f5e6f3560f1fe5901b10ec89 /WebCore/loader | |
| parent | d8fde132eda313d695830dde5754c80074e2f0d4 (diff) | |
| download | external_webkit-e080fc6aeb560dc0570348d955fe35c2639e312c.zip external_webkit-e080fc6aeb560dc0570348d955fe35c2639e312c.tar.gz external_webkit-e080fc6aeb560dc0570348d955fe35c2639e312c.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflict in CachedImage.cpp due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/52177
Change-Id: I0c9e64766c6d7c9479100fb5b313b4562c5e7e42
Diffstat (limited to 'WebCore/loader')
| -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; } |