CREDENTIAL: Rework the integration with Fetch (1/2)

third_party/WebKit/Source/platform/network/ResourceRequest.cpp

Index: third_party/WebKit/Source/platform/network/ResourceRequest.cpp
diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
index 549422c23c414159cc968f1b8ab9327c90dae240..cbd1fa8033c3ca00f04a1f7a76ba15144625144b 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
@@ -51,6 +51,7 @@ ResourceRequest::ResourceRequest(CrossThreadResourceRequestData* data)
     m_httpHeaderFields.adopt(data->m_httpHeaders.release());
 
     setHTTPBody(data->m_httpBody);
+    setAttachedCredentialBody(data->m_attachedCredentialBody);
     setAllowStoredCredentials(data->m_allowStoredCredentials);
     setReportUploadProgress(data->m_reportUploadProgress);
     setHasUserGesture(data->m_hasUserGesture);
@@ -91,6 +92,8 @@ PassOwnPtr<CrossThreadResourceRequestData> ResourceRequest::copyData() const
 
     if (m_httpBody)
         data->m_httpBody = m_httpBody->deepCopy();
+    if (m_attachedCredentialBody)
+        data->m_attachedCredentialBody = m_attachedCredentialBody->deepCopy();
     data->m_allowStoredCredentials = m_allowStoredCredentials;
     data->m_reportUploadProgress = m_reportUploadProgress;
     data->m_hasUserGesture = m_hasUserGesture;
@@ -283,6 +286,16 @@ void ResourceRequest::setHTTPBody(PassRefPtr<EncodedFormData> httpBody)
     m_httpBody = httpBody;
 }
 
+EncodedFormData* ResourceRequest::attachedCredentialBody() const
+{
+    return m_attachedCredentialBody.get();
+}
+
+void ResourceRequest::setAttachedCredentialBody(PassRefPtr<EncodedFormData> attachedCredentialBody)
+{
+    m_attachedCredentialBody = attachedCredentialBody;
+}
+
 bool ResourceRequest::allowStoredCredentials() const
 {
     return m_allowStoredCredentials;
@@ -360,6 +373,17 @@ bool ResourceRequest::compare(const ResourceRequest& a, const ResourceRequest& b
     if (*formDataA != *formDataB)
         return false;
 
+    formDataA = a.attachedCredentialBody();
+    formDataB = b.attachedCredentialBody();
+
+    if (!formDataA)
+        return !formDataB;
+    if (!formDataB)
+        return !formDataA;
+
+    if (*formDataA != *formDataB)
+        return false;
+
     if (a.httpHeaderFields() != b.httpHeaderFields())
         return false;