diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-22 11:43:42 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-11-30 14:00:46 +0000 |
| commit | 797c8d1884320bf1f1c034a8ab96fdacde0eb101 (patch) | |
| tree | 6bd37168e0069694b1a059cda6db37176ff3bdb2 /Source/WebCore/loader/cache/CachedResource.cpp | |
| parent | 32f189562f7180e69a4d92f57cd6d24d8ef21b65 (diff) | |
| download | external_webkit-797c8d1884320bf1f1c034a8ab96fdacde0eb101.zip external_webkit-797c8d1884320bf1f1c034a8ab96fdacde0eb101.tar.gz external_webkit-797c8d1884320bf1f1c034a8ab96fdacde0eb101.tar.bz2 | |
Do not load uncached images if blocked by embedding app.
Ensure that onload callbacks are not sent for images that
are not actually loaded.
This is based off the patch and discussion in
https://bugs.webkit.org/show_bug.cgi?id=71661
Bug: 5522414
Change-Id: I6366448bce5dd053bda3bfecb18c02943fe645a2
Diffstat (limited to 'Source/WebCore/loader/cache/CachedResource.cpp')
| -rw-r--r-- | Source/WebCore/loader/cache/CachedResource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp index 95f5522..e599769 100644 --- a/Source/WebCore/loader/cache/CachedResource.cpp +++ b/Source/WebCore/loader/cache/CachedResource.cpp @@ -261,7 +261,7 @@ void CachedResource::addClient(CachedResourceClient* client) void CachedResource::didAddClient(CachedResourceClient* c) { - if (!isLoading()) + if (!isLoading() && !stillNeedsLoad()) c->notifyFinished(this); } |