diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:31 -0800 |
| commit | 11ecc8563736f4aaf10c0ae07d7cb814e4c3fcd5 (patch) | |
| tree | 3b1aeab0a98bccaf94553de9dfad49513f794de9 /WebCore/loader | |
| parent | c9c497faa69a20ac6ff0360281f8896e373a79f9 (diff) | |
| download | external_webkit-11ecc8563736f4aaf10c0ae07d7cb814e4c3fcd5.zip external_webkit-11ecc8563736f4aaf10c0ae07d7cb814e4c3fcd5.tar.gz external_webkit-11ecc8563736f4aaf10c0ae07d7cb814e4c3fcd5.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'WebCore/loader')
| -rw-r--r-- | WebCore/loader/CachedImage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp index b915b17..3327c38 100644 --- a/WebCore/loader/CachedImage.cpp +++ b/WebCore/loader/CachedImage.cpp @@ -77,7 +77,11 @@ void CachedImage::decodedDataDeletionTimerFired(Timer<CachedImage>*) void CachedImage::load(DocLoader* docLoader) { +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + if (!docLoader || (docLoader->autoLoadImages() && !docLoader->shouldBlockNetworkImage(m_url))) +#else if (!docLoader || docLoader->autoLoadImages()) +#endif CachedResource::load(docLoader, true, false, true); else m_loading = false; |