For local review prior to sending to webkit

platform/network/ResourceRequestBase.h

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * 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.
@@ skipping 13 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 ResourceRequestBase_h
 #define ResourceRequestBase_h
 
 #include "FormData.h"
 #include "KURL.h"
 #include "HTTPHeaderMap.h"
+#if ENABLE(APPLICATION_CACHE)
+#include "ApplicationCacheCommon.h"
+#endif
 
 #include <memory>
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
     enum ResourceRequestCachePolicy {
         UseProtocolCachePolicy, // normal load
         ReloadIgnoringCacheData, // reload
         ReturnCacheDataElseLoad, // back/forward or encoding change - allow stale data
@@ skipping 64 matching lines @@
         bool allowHTTPCookies() const;
         void setAllowHTTPCookies(bool allowHTTPCookies);
 
         bool isConditional() const;
 
         // Whether the associated ResourceHandleClient needs to be notified of
         // upload progress made for that resource.
         bool reportUploadProgress() const { return m_reportUploadProgress; }
         void setReportUploadProgress(bool reportUploadProgress) { m_reportUploadProgress = reportUploadProgress; }
 
+#if ENABLE(APPLICATION_CACHE)
+        // Allows the request to be matched up with its cache context.
+        GlobalApplicationCacheContextID applicationCacheContextID() const { return m_appcacheContextID; }
+        void setApplicationCacheContextID(GlobalApplicationCacheContextID id) { m_appcacheContextID = id; }
+#endif
+
     protected:
         // Used when ResourceRequest is initialized from a platform representation of the request
         ResourceRequestBase()
             : m_resourceRequestUpdated(false)
             , m_platformRequestUpdated(true)
             , m_reportUploadProgress(false)
         {
         }
 
         ResourceRequestBase(const KURL& url, ResourceRequestCachePolicy policy)
@@ skipping 17 matching lines @@
         double m_timeoutInterval;
         KURL m_firstPartyForCookies;
         String m_httpMethod;
         HTTPHeaderMap m_httpHeaderFields;
         Vector<String> m_responseContentDispositionEncodingFallbackArray;
         RefPtr<FormData> m_httpBody;
         bool m_allowHTTPCookies;
         mutable bool m_resourceRequestUpdated;
         mutable bool m_platformRequestUpdated;
         bool m_reportUploadProgress;
-
+#if ENABLE(APPLICATION_CACHE)
+        GlobalApplicationCacheContextID m_appcacheContextID;
+#endif
     private:
         const ResourceRequest& asResourceRequest() const;
     };
 
     bool equalIgnoringHeaderFields(const ResourceRequestBase&, const ResourceRequestBase&);
 
     bool operator==(const ResourceRequestBase&, const ResourceRequestBase&);
     inline bool operator!=(ResourceRequestBase& a, const ResourceRequestBase& b) { return !(a == b); }
 
     struct CrossThreadResourceRequestData {
         KURL m_url;
 
         ResourceRequestCachePolicy m_cachePolicy;
         double m_timeoutInterval;
         KURL m_firstPartyForCookies;
 
         String m_httpMethod;
         OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
         Vector<String> m_responseContentDispositionEncodingFallbackArray;
         RefPtr<FormData> m_httpBody;
         bool m_allowHTTPCookies;
+#if ENABLE(APPLICATION_CACHE)
+        GlobalApplicationCacheContextID m_appcacheContextID;
+#endif
     };
     
     unsigned initializeMaximumHTTPConnectionCountPerHost();
 
 } // namespace WebCore
 
 #endif // ResourceRequestBase_h