ImageResource: Reset the encoded image size after receiving all data

third_party/WebKit/Source/core/fetch/Resource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 285 matching lines @@
   for (const auto& resource : resources)
     resource->finishPendingClients();
 }
 
 Resource::Resource(const ResourceRequest& request,
                    Type type,
                    const ResourceLoaderOptions& options)
     : m_loadFinishTime(0),
       m_identifier(0),
       m_encodedSize(0),
+      m_encodedSizeMemoryUsage(0),
       m_decodedSize(0),
       m_overheadSize(calculateOverheadSize()),
       m_preloadCount(0),
       m_preloadDiscoveryTime(0.0),
       m_cacheIdentifier(MemoryCache::defaultCacheIdentifier()),
       m_preloadResult(PreloadNotReferenced),
       m_type(type),
       m_status(NotStarted),
       m_needsSynchronousCacheHit(false),
       m_linkPreload(false),
@@ skipping 468 matching lines @@
 void Resource::setDecodedSize(size_t decodedSize) {
   if (decodedSize == m_decodedSize)
     return;
   size_t oldSize = size();
   m_decodedSize = decodedSize;
   memoryCache()->update(this, oldSize, size());
   memoryCache()->updateDecodedResource(this, UpdateForPropertyChange);
 }
 
 void Resource::setEncodedSize(size_t encodedSize) {
-  if (encodedSize == m_encodedSize)
+  if (encodedSize == m_encodedSize && encodedSize == m_encodedSizeMemoryUsage)
     return;
   size_t oldSize = size();
   m_encodedSize = encodedSize;
+  m_encodedSizeMemoryUsage = encodedSize;
   memoryCache()->update(this, oldSize, size());
 }
 
+void Resource::setEncodedSizeMemoryUsage(size_t encodedSize) {

[yhirano, 2016/10/14 09:20:00]

Can you remove this function, and set m_encodedSizeMemoryUsage to 0 in
clearData?

[hajimehoshi, 2016/10/14 09:29:51]

Hmm, your suggestion would affect other resources than ImageResource, which I
don't want to do in this CL.

+  if (encodedSize == m_encodedSizeMemoryUsage)
+    return;
+  size_t oldSize = size();
+  m_encodedSizeMemoryUsage = encodedSize;
+  memoryCache()->update(this, oldSize, size());

[yhirano, 2016/10/14 09:20:00]

This is now not needed, right?

[hajimehoshi, 2016/10/14 09:29:51]

Done.

+}
+
 void Resource::didAccessDecodedData() {
   memoryCache()->updateDecodedResource(this, UpdateForAccess);
   memoryCache()->prune();
 }
 
 void Resource::finishPendingClients() {
   // We're going to notify clients one by one. It is simple if the client does
   // nothing. However there are a couple other things that can happen.
   //
   // 1. Clients can be added during the loop. Make sure they are not processed.
@@ skipping 41 matching lines @@
 }
 
 void Resource::onMemoryDump(WebMemoryDumpLevelOfDetail levelOfDetail,
                             WebProcessMemoryDump* memoryDump) const {
   static const size_t kMaxURLReportLength = 128;
   static const int kMaxResourceClientToShowInMemoryInfra = 10;
 
   const String dumpName = getMemoryDumpName();
   WebMemoryAllocatorDump* dump =
       memoryDump->createMemoryAllocatorDump(dumpName);
-  dump->addScalar("encoded_size", "bytes", m_encodedSize);
+  dump->addScalar("encoded_size", "bytes", m_encodedSizeMemoryUsage);
   if (hasClientsOrObservers())
-    dump->addScalar("live_size", "bytes", m_encodedSize);
+    dump->addScalar("live_size", "bytes", m_encodedSizeMemoryUsage);
   else
-    dump->addScalar("dead_size", "bytes", m_encodedSize);
+    dump->addScalar("dead_size", "bytes", m_encodedSizeMemoryUsage);
 
   if (m_data)
     m_data->onMemoryDump(dumpName, memoryDump);
 
   if (levelOfDetail == WebMemoryDumpLevelOfDetail::Detailed) {
     String urlToReport = url().getString();
     if (urlToReport.length() > kMaxURLReportLength) {
       urlToReport.truncate(kMaxURLReportLength);
       urlToReport = urlToReport + "...";
     }
@@ skipping 219 matching lines @@
     case Resource::TextTrack:
     case Resource::Media:
     case Resource::Manifest:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace blink