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

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

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2009, 2012 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 33 matching lines @@
     setCachePolicy(data->m_cachePolicy);
     setTimeoutInterval(data->m_timeoutInterval);
     setFirstPartyForCookies(data->m_firstPartyForCookies);
     setRequestorOrigin(data->m_requestorOrigin);
     setHTTPMethod(AtomicString(data->m_httpMethod));
     setPriority(data->m_priority, data->m_intraPriorityValue);
 
     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);
     setDownloadToFile(data->m_downloadToFile);
     setUseStreamOnResponse(data->m_useStreamOnResponse);
     setSkipServiceWorker(data->m_skipServiceWorker);
     setShouldResetAppCache(data->m_shouldResetAppCache);
     setRequestorID(data->m_requestorID);
     setRequestorProcessID(data->m_requestorProcessID);
     setAppCacheHostID(data->m_appCacheHostID);
@@ skipping 20 matching lines @@
     data->m_timeoutInterval = timeoutInterval();
     data->m_firstPartyForCookies = firstPartyForCookies().copy();
     data->m_requestorOrigin = requestorOrigin() ? requestorOrigin()->isolatedCopy() : nullptr;
     data->m_httpMethod = httpMethod().getString().isolatedCopy();
     data->m_httpHeaders = httpHeaderFields().copyData();
     data->m_priority = priority();
     data->m_intraPriorityValue = m_intraPriorityValue;
 
     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;
     data->m_downloadToFile = m_downloadToFile;
     data->m_useStreamOnResponse = m_useStreamOnResponse;
     data->m_skipServiceWorker = m_skipServiceWorker;
     data->m_shouldResetAppCache = m_shouldResetAppCache;
     data->m_requestorID = m_requestorID;
     data->m_requestorProcessID = m_requestorProcessID;
     data->m_appCacheHostID = m_appCacheHostID;
@@ skipping 172 matching lines @@
 EncodedFormData* ResourceRequest::httpBody() const
 {
     return m_httpBody.get();
 }
 
 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;
 }
 
 void ResourceRequest::setAllowStoredCredentials(bool allowCredentials)
 {
     m_allowStoredCredentials = allowCredentials;
 }
 
@@ skipping 20 matching lines @@
     HTTPHeaderMap::const_iterator end = headerFields.end();
     for (HTTPHeaderMap::const_iterator it = headerFields.begin(); it != end; ++it)
         addHTTPHeaderField(it->key, it->value);
 }
 
 void ResourceRequest::clearHTTPHeaderField(const AtomicString& name)
 {
     m_httpHeaderFields.remove(name);
 }
 
 bool ResourceRequest::compare(const ResourceRequest& a, const ResourceRequest& b)

[horo, 2016/04/04 05:26:00]

There is no code which compares ResourceRequests.
We can remove ResourceRequest::compare() and operator==(const ResourceRequest&
a, const ResourceRequest& b) and operator!=(ResourceRequest& a, const
ResourceRequest& b).

[Mike West, 2016/04/04 08:04:20]

I've added a TODO, and I'll take a look in a separate patch.

 {
     if (a.url() != b.url())
         return false;
 
     if (a.getCachePolicy() != b.getCachePolicy())
         return false;
 
     if (a.timeoutInterval() != b.timeoutInterval())
         return false;
 
@@ skipping 16 matching lines @@
     EncodedFormData* formDataB = b.httpBody();
 
     if (!formDataA)
         return !formDataB;
     if (!formDataB)
         return !formDataA;
 
     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;
 
     return true;
 }
 
 void ResourceRequest::setExternalRequestStateFromRequestorAddressSpace(WebAddressSpace requestorSpace)
 {
     static_assert(WebAddressSpaceLocal < WebAddressSpacePrivate, "Local is inside Private");
     static_assert(WebAddressSpaceLocal < WebAddressSpacePublic, "Local is inside Public");
@@ skipping 80 matching lines @@
     m_didSetHTTPReferrer = false;
     m_checkForBrowserSideNavigation = true;
     m_uiStartTime = 0;
     m_isExternalRequest = false;
     m_inputPerfMetricReportPolicy = InputToLoadPerfMetricReportPolicy::NoReport;
     m_followedRedirect = false;
     m_requestorOrigin = SecurityOrigin::createUnique();
 }
 
 } // namespace blink