Ensure setEncodedSizeMemoryUsage() is called when |m_data| is cleared

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 377 matching lines @@
 }
 
 void Resource::setResourceBuffer(PassRefPtr<SharedBuffer> resourceBuffer) {
   DCHECK(!m_isRevalidating);
   DCHECK(!errorOccurred());
   DCHECK_EQ(m_options.dataBufferingPolicy, BufferData);
   m_data = resourceBuffer;
   setEncodedSize(m_data->size());
 }
 
+void Resource::clearData() {
+  m_data.clear();
+  m_encodedSizeMemoryUsage = 0;
+}
+
 void Resource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy) {
   m_options.dataBufferingPolicy = dataBufferingPolicy;
-  m_data.clear();
+  clearData();
   setEncodedSize(0);
 }
 
 void Resource::error(const ResourceError& error) {
   DCHECK(!error.isNull());
   m_error = error;
   m_isRevalidating = false;
 
   if (m_error.isCancellation() || !isPreloaded())
     memoryCache()->remove(this);
 
   if (!errorOccurred())
     setStatus(LoadError);
   DCHECK(errorOccurred());
-  m_data.clear();
+  clearData();
   m_loader = nullptr;
   checkNotify();
 }
 
 void Resource::finish(double loadFinishTime) {
   DCHECK(!m_isRevalidating);
   m_loadFinishTime = loadFinishTime;
   if (!errorOccurred())
     m_status = Cached;
   m_loader = nullptr;
@@ skipping 367 matching lines @@
 
 void Resource::setEncodedSize(size_t 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) {
-  m_encodedSizeMemoryUsage = encodedSize;
-}
-
 void Resource::didAccessDecodedData() {
   memoryCache()->updateDecodedResource(this, UpdateForAccess);
 }
 
 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.
   // 2. Clients can be removed during the loop. Make sure they are always
@@ skipping 143 matching lines @@
     if (!shouldUpdateHeaderAfterRevalidation(header.key))
       continue;
     m_response.setHTTPHeaderField(header.key, header.value);
   }
 
   m_isRevalidating = false;
 }
 
 void Resource::revalidationFailed() {
   SECURITY_CHECK(m_redirectChain.isEmpty());
-  m_data.clear();
+  clearData();
   m_cacheHandler.clear();
   destroyDecodedDataForFailedRevalidation();
   m_isRevalidating = false;
 }
 
 bool Resource::canReuseRedirectChain() {
   for (auto& redirect : m_redirectChain) {
     if (!canUseResponse(redirect.m_redirectResponse, m_responseTimestamp))
       return false;
     if (redirect.m_request.cacheControlContainsNoCache() ||
@@ skipping 126 matching lines @@
     case Resource::TextTrack:
     case Resource::Media:
     case Resource::Manifest:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace blink