Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: third_party/WebKit/Source/core/fetch/ImageResource.cpp

Issue 2054643003: Remove duplication of encoded image data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: m_image should not be cleared Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « third_party/WebKit/Source/core/clipboard/DataTransfer.cpp ('k') | third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698