diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/loader/cache/CachedImage.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/loader/cache/CachedImage.cpp')
| -rw-r--r-- | Source/WebCore/loader/cache/CachedImage.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp index 057b8ea..b309ae6 100644 --- a/Source/WebCore/loader/cache/CachedImage.cpp +++ b/Source/WebCore/loader/cache/CachedImage.cpp @@ -31,6 +31,7 @@ #include "CachedResourceLoader.h" #include "CachedResourceRequest.h" #include "Frame.h" +#include "FrameLoaderClient.h" #include "FrameLoaderTypes.h" #include "FrameView.h" #include "Settings.h" @@ -55,6 +56,7 @@ CachedImage::CachedImage(const String& url) : CachedResource(url, ImageResource) , m_image(0) , m_decodedDataDeletionTimer(this, &CachedImage::decodedDataDeletionTimerFired) + , m_shouldPaintBrokenImage(true) { setStatus(Unknown); } @@ -63,6 +65,7 @@ CachedImage::CachedImage(Image* image) : CachedResource(String(), ImageResource) , m_image(image) , m_decodedDataDeletionTimer(this, &CachedImage::decodedDataDeletionTimerFired) + , m_shouldPaintBrokenImage(true) { setStatus(Cached); setLoading(false); @@ -124,7 +127,7 @@ Image* CachedImage::image() const { ASSERT(!isPurgeable()); - if (errorOccurred()) + if (errorOccurred() && m_shouldPaintBrokenImage) return brokenImage(); if (m_image) @@ -220,6 +223,15 @@ void CachedImage::notifyObservers(const IntRect* changeRect) c->imageChanged(this, changeRect); } +void CachedImage::checkShouldPaintBrokenImage() +{ + Frame* frame = m_request ? m_request->cachedResourceLoader()->frame() : 0; + if (!frame) + return; + + m_shouldPaintBrokenImage = frame->loader()->client()->shouldPaintBrokenImage(KURL(ParsedURLString, m_url)); +} + void CachedImage::clear() { destroyDecodedData(); @@ -303,6 +315,7 @@ void CachedImage::data(PassRefPtr<SharedBuffer> data, bool allDataReceived) void CachedImage::error(CachedResource::Status status) { + checkShouldPaintBrokenImage(); clear(); setStatus(status); ASSERT(errorOccurred()); |