Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google, Inc. All rights reserved. | 2 * Copyright (C) 2012 Google, Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 62 , m_defer(NoDefer) | 62 , m_defer(NoDefer) |
| 63 , m_originRestriction(UseDefaultOriginRestrictionForType) | 63 , m_originRestriction(UseDefaultOriginRestrictionForType) |
| 64 { | 64 { |
| 65 m_options.initiatorInfo = initiator; | 65 m_options.initiatorInfo = initiator; |
| 66 } | 66 } |
| 67 | 67 |
| 68 FetchRequest::~FetchRequest() | 68 FetchRequest::~FetchRequest() |
| 69 { | 69 { |
| 70 } | 70 } |
| 71 | 71 |
| 72 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials, CredentialRequest requested) | |
| 73 { | |
| 74 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); | |
| 75 m_options.corsEnabled = IsCORSEnabled; | |
| 76 m_options.securityOrigin = origin; | |
| 77 m_options.credentialsRequested = requested; | |
|
abarth-chromium
2014/03/12 18:49:32
What does it mean to call this function with allow
Hajime Morrita
2014/03/12 18:56:11
There shouldn't be that combination. Will add an A
| |
| 78 } | |
| 79 | |
| 72 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials) | 80 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials) |
| 73 { | 81 { |
| 74 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); | 82 setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == Al lowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentia ls); |
| 75 m_options.corsEnabled = IsCORSEnabled; | |
| 76 m_options.securityOrigin = origin; | |
| 77 } | 83 } |
| 78 | 84 |
| 79 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode) | 85 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode) |
| 80 { | 86 { |
| 81 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use- credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); | 87 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use- credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); |
| 82 } | 88 } |
| 83 | 89 |
| 84 } // namespace WebCore | 90 } // namespace WebCore |
| OLD | NEW |