Do not update Resource::overheadSize() for ResourceRequest's URL modifications

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 131 matching lines @@
     PreloadResult getPreloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
 
     unsigned count() const { return m_clients.size(); }
 
     Status getStatus() const { return static_cast<Status>(m_status); }
     void setStatus(Status status) { m_status = status; }
 
     size_t size() const { return encodedSize() + decodedSize() + overheadSize(); }
     size_t encodedSize() const { return m_encodedSize; }
     size_t decodedSize() const { return m_decodedSize; }
-    size_t overheadSize() const;
+    size_t overheadSize() const { return m_overheadSize; }
 
     bool isLoaded() const { return m_status > Pending; }
 
     bool isLoading() const { return m_status == Pending; }
     bool stillNeedsLoad() const { return m_status < Pending; }
 
     ResourceLoader* loader() const { return m_loader.get(); }
 
     virtual bool isImage() const { return false; }
     bool shouldBlockLoadEvent() const;
@@ skipping 160 matching lines @@
     RefPtr<SharedBuffer> m_data;
     Timer<Resource> m_cancelTimer;
 
 private:
     class CacheHandler;
     void cancelTimerFired(Timer<Resource>*);
 
     void revalidationSucceeded(const ResourceResponse&);
     void revalidationFailed();
 
+    size_t calculateOverheadSize() const;
+
     bool unlock();
 
     void setCachedMetadata(unsigned dataTypeID, const char*, size_t, CachedMetadataHandler::CacheType);
     void clearCachedMetadata(CachedMetadataHandler::CacheType);
     CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
 
     String m_fragmentIdentifierForRequest;
 
 #if !ENABLE(OILPAN)
     WeakPtrFactory<Resource> m_weakPtrFactory;
 #endif
 
     RefPtr<CachedMetadata> m_cachedMetadata;
     OwnPtrWillBeMember<CacheHandler> m_cacheHandler;
 
     ResourceError m_error;
 
     double m_loadFinishTime;
 
     unsigned long m_identifier;
 
     size_t m_encodedSize;
     size_t m_decodedSize;
+
+    // Resource::calculateOverheadSize() is affected by changes in
+    // |m_resourceRequest.url()|, but |m_overheadSize| is not updated after
+    // initial |m_resourceRequest| is given, to reduce MemoryCache manipulation
+    // and thus potential bugs. crbug.com/594644
+    const size_t m_overheadSize;
+
     unsigned m_preloadCount;
 
     String m_cacheIdentifier;
 
     unsigned m_preloadResult : 2; // PreloadResult
     unsigned m_type : 4; // Type
     unsigned m_status : 3; // Status
 
     unsigned m_needsSynchronousCacheHit : 1;
     unsigned m_linkPreload : 1;
@@ skipping 14 matching lines @@
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName); \
     inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif