Allow cache reuse of some requests with Cache-Control headers

Source/platform/network/ResourceResponse.h

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ResourceResponse_h
 #define ResourceResponse_h
 
 #include "platform/PlatformExport.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/HTTPHeaderMap.h"
+#include "platform/network/HTTPParsers.h"
 #include "platform/network/ResourceLoadInfo.h"
 #include "platform/network/ResourceLoadTiming.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 
 namespace WebCore {
 
 struct CrossThreadResourceResponseData;
@@ skipping 53 matching lines @@
 
     bool isAttachment() const;
 
     // FIXME: These are used by PluginStream on some platforms. Calculations may differ from just returning plain Last-Modified header.
     // Leaving it for now but this should go away in favor of generic solution.
     void setLastModifiedDate(time_t);
     time_t lastModifiedDate() const;
 
     // These functions return parsed values of the corresponding response headers.
     // NaN means that the header was not present or had invalid value.
-    bool cacheControlContainsNoCache() const;
-    bool cacheControlContainsNoStore() const;
-    bool cacheControlContainsMustRevalidate() const;
+    bool cacheControlContainsNoCache();
+    bool cacheControlContainsNoStore();
+    bool cacheControlContainsMustRevalidate();
     bool hasCacheValidatorFields() const;
-    double cacheControlMaxAge() const;
+    double cacheControlMaxAge();
     double date() const;
     double age() const;
     double expires() const;
     double lastModified() const;
 
     unsigned connectionID() const;
     void setConnectionID(unsigned);
 
     bool connectionReused() const;
     void setConnectionReused(bool);
@@ skipping 59 matching lines @@
     // The ResourceResponse subclass may "shadow" this method to provide platform-specific memory usage information
     unsigned memoryUsage() const
     {
         // average size, mostly due to URL and Header Map strings
         return 1280;
     }
 
     static bool compare(const ResourceResponse&, const ResourceResponse&);
 
 private:
-    void parseCacheControlDirectives() const;
     void updateHeaderParsedState(const AtomicString& name);
 
     KURL m_url;
     AtomicString m_mimeType;
     long long m_expectedContentLength;
     AtomicString m_textEncodingName;
     String m_suggestedFilename;
     int m_httpStatusCode;
     AtomicString m_httpStatusText;
     HTTPHeaderMap m_httpHeaderFields;
     time_t m_lastModifiedDate;
     bool m_wasCached : 1;
     unsigned m_connectionID;
     bool m_connectionReused : 1;
     RefPtr<ResourceLoadTiming> m_resourceLoadTiming;
     RefPtr<ResourceLoadInfo> m_resourceLoadInfo;
 
     bool m_isNull : 1;
 
-    mutable bool m_haveParsedCacheControlHeader : 1;
+    CacheControlHeader m_cacheControlHeader;
+
     mutable bool m_haveParsedAgeHeader : 1;
     mutable bool m_haveParsedDateHeader : 1;
     mutable bool m_haveParsedExpiresHeader : 1;
     mutable bool m_haveParsedLastModifiedHeader : 1;
 
-    mutable bool m_cacheControlContainsNoCache : 1;
-    mutable bool m_cacheControlContainsNoStore : 1;
-    mutable bool m_cacheControlContainsMustRevalidate : 1;
-    mutable double m_cacheControlMaxAge;
-
     mutable double m_age;
     mutable double m_date;
     mutable double m_expires;
     mutable double m_lastModified;
 
     // An opaque value that contains some information regarding the security of
     // the connection for this request, such as SSL connection info (empty
     // string if not over HTTPS).
     CString m_securityInfo;
 
@@ skipping 74 matching lines @@
     double m_responseTime;
     String m_remoteIPAddress;
     unsigned short m_remotePort;
     String m_downloadedFilePath;
     RefPtr<BlobDataHandle> m_downloadedFileHandle;
 };
 
 } // namespace WebCore
 
 #endif // ResourceResponse_h