Index: trunk/Source/core/fetch/FetchRequest.cpp |
=================================================================== |
--- trunk/Source/core/fetch/FetchRequest.cpp (revision 169503) |
+++ trunk/Source/core/fetch/FetchRequest.cpp (working copy) |
@@ -69,20 +69,13 @@ |
{ |
} |
-void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCredentials allowCredentials, CredentialRequest requested) |
+void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCredentials allowCredentials) |
{ |
- ASSERT(requested != ClientDidNotRequestCredentials || allowCredentials == AllowStoredCredentials); |
updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); |
m_options.corsEnabled = IsCORSEnabled; |
m_options.securityOrigin = origin; |
- m_options.credentialsRequested = requested; |
} |
-void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCredentials allowCredentials) |
-{ |
- setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == AllowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentials); |
-} |
- |
void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const AtomicString& crossOriginMode) |
{ |
setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); |