Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp |
diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp |
index 6ebd8315d925a5caf55530bf8627cac0c344b0cc..8eba2ab1c31965ea7af7debdc2e0045105b1b196 100644 |
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp |
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp |
@@ -123,11 +123,6 @@ void ImageResource::addObserver(ImageResourceObserver* observer) |
if (isCacheValidator()) |
return; |
- if (m_data && !m_image && !errorOccurred()) { |
- createImage(); |
- m_image->setData(m_data, true); |
- } |
- |
if (m_image && !m_image->isNull()) { |
observer->imageChanged(this); |
} |
@@ -392,6 +387,7 @@ void ImageResource::finish(double loadFinishTime) |
updateImageAndClearBuffer(); |
} else { |
updateImage(true); |
+ m_data.clear(); |
} |
Resource::finish(loadFinishTime); |
} |
@@ -500,10 +496,9 @@ void ImageResource::reloadIfLoFi(ResourceFetcher* fetcher) |
return; |
m_resourceRequest.setCachePolicy(WebCachePolicy::BypassingCache); |
m_resourceRequest.setLoFiState(WebURLRequest::LoFiOff); |
- if (isLoading()) |
+ if (isLoading()) { |
m_loader->cancel(); |
- else |
- updateImageAndClearBuffer(); |
+ } |
setStatus(NotStarted); |
fetcher->startLoad(this); |
} |