Get WebKit r44544.

3 files changed, 27 insertions, 12 deletions

diff --git a/WebCore/platform/network/chromium/CookieJarChromium.cpp b/WebCore/platform/network/chromium/CookieJarChromium.cpp
index 50cab3b..65be451 100644
--- a/WebCore/platform/network/chromium/CookieJarChromium.cpp
+++ b/WebCore/platform/network/chromium/CookieJarChromium.cpp
@@ -36,16 +36,14 @@
 
 namespace WebCore {
 
-void setCookies(Document* document, const KURL& url, const KURL& policyURL, const String& value)
+void setCookies(Document* document, const KURL& url, const String& value)
 {
-    // We ignore the policyURL and compute it directly ourselves to ensure
-    // consistency with the cookies() method below.
-    ChromiumBridge::setCookies(url, document->policyBaseURL(), value);
+    ChromiumBridge::setCookies(url, document->firstPartyForCookies(), value);
 }
 
 String cookies(const Document* document, const KURL& url)
 {
-    return ChromiumBridge::cookies(url, document->policyBaseURL());
+    return ChromiumBridge::cookies(url, document->firstPartyForCookies());
 }
 
 bool cookiesEnabled(const Document*)
diff --git a/WebCore/platform/network/chromium/ResourceRequest.h b/WebCore/platform/network/chromium/ResourceRequest.h
index b14dba6..aa76de4 100644
--- a/WebCore/platform/network/chromium/ResourceRequest.h
+++ b/WebCore/platform/network/chromium/ResourceRequest.h
@@ -49,6 +49,7 @@ namespace WebCore {
             : ResourceRequestBase(KURL(url), UseProtocolCachePolicy)
             , m_requestorID(0)
             , m_requestorProcessID(0)
+            , m_appCacheContextID(0)
             , m_targetType(TargetIsSubResource)
         {
         }
@@ -57,6 +58,7 @@ namespace WebCore {
             : ResourceRequestBase(url, UseProtocolCachePolicy)
             , m_requestorID(0)
             , m_requestorProcessID(0)
+            , m_appCacheContextID(0)
             , m_targetType(TargetIsSubResource)
             , m_securityInfo(securityInfo)
         {
@@ -66,6 +68,7 @@ namespace WebCore {
             : ResourceRequestBase(url, UseProtocolCachePolicy)
             , m_requestorID(0)
             , m_requestorProcessID(0)
+            , m_appCacheContextID(0)
             , m_targetType(TargetIsSubResource)
         {
         }
@@ -74,6 +77,7 @@ namespace WebCore {
             : ResourceRequestBase(url, policy)
             , m_requestorID(0)
             , m_requestorProcessID(0)
+            , m_appCacheContextID(0)
             , m_targetType(TargetIsSubResource)
         {
             setHTTPReferrer(referrer);
@@ -83,6 +87,7 @@ namespace WebCore {
             : ResourceRequestBase(KURL(), UseProtocolCachePolicy)
             , m_requestorID(0)
             , m_requestorProcessID(0)
+            , m_appCacheContextID(0)
             , m_targetType(TargetIsSubResource)
         {
         }
@@ -95,10 +100,6 @@ namespace WebCore {
         TargetType targetType() const { return m_targetType; }
         void setTargetType(TargetType type) { m_targetType = type; }
 
-        // The document's policy base url.
-        KURL policyURL() const { return m_policyURL; }
-        void setPolicyURL(const KURL& policyURL) { m_policyURL = policyURL; }
-
         // The process id of the process from which this request originated. In
         // the case of out-of-process plugins, this allows to link back the
         // request to the plugin process (as it is processed through a render
@@ -106,6 +107,10 @@ namespace WebCore {
         int requestorProcessID() const { return m_requestorProcessID; }
         void setRequestorProcessID(int requestorProcessID) { m_requestorProcessID = requestorProcessID; }
 
+        // Allows the request to be matched up with its app cache context.
+        int appCacheContextID() const { return m_appCacheContextID; }
+        void setAppCacheContextID(int id) { m_appCacheContextID = id; }
+
         // Opaque buffer that describes the security state (including SSL
         // connection state) for the resource that should be reported when the
         // resource has been loaded.  This is used to simulate secure
@@ -123,9 +128,9 @@ namespace WebCore {
 
         int m_requestorID;
         int m_requestorProcessID;
+        int m_appCacheContextID;
         TargetType m_targetType;
         CString m_securityInfo;
-        KURL m_policyURL;
     };
 
 } // namespace WebCore
diff --git a/WebCore/platform/network/chromium/ResourceResponse.h b/WebCore/platform/network/chromium/ResourceResponse.h
index 256df74..6c928c0 100644
--- a/WebCore/platform/network/chromium/ResourceResponse.h
+++ b/WebCore/platform/network/chromium/ResourceResponse.h
@@ -37,12 +37,14 @@ namespace WebCore {
     public:
         ResourceResponse()
             : m_isContentFiltered(false)
+            , m_appCacheID(0)
         {
         }
 
         ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
-            : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename),
-              m_isContentFiltered(false)
+            : ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
+            , m_isContentFiltered(false)
+            , m_appCacheID(0)
         {
         }
 
@@ -58,6 +60,12 @@ namespace WebCore {
             m_isContentFiltered = isContentFiltered;
         }
 
+        long long getAppCacheID() const { return m_appCacheID; }
+        void setAppCacheID(long long id)
+        {
+            m_appCacheID = id;
+        }
+
     private:
         friend class ResourceResponseBase;
 
@@ -74,6 +82,10 @@ namespace WebCore {
         // Whether the contents for this response has been altered/blocked (usually
         // for security reasons.
         bool m_isContentFiltered;
+
+        // The id of the appcache this response was retrieved from, or zero if
+        // the response was not retrieved from an appcache.
+        long long m_appCacheID;
     };
 
 } // namespace WebCore