| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 { | 63 { |
| 64 m_options.initiatorInfo = initiator; | 64 m_options.initiatorInfo = initiator; |
| 65 } | 65 } |
| 66 | 66 |
| 67 CachedResourceRequest::~CachedResourceRequest() | 67 CachedResourceRequest::~CachedResourceRequest() |
| 68 { | 68 { |
| 69 } | 69 } |
| 70 | 70 |
| 71 void CachedResourceRequest::setPotentiallyCrossOriginEnabled(SecurityOrigin* ori
gin, StoredCredentials allowCredentials) | 71 void CachedResourceRequest::setPotentiallyCrossOriginEnabled(SecurityOrigin* ori
gin, StoredCredentials allowCredentials) |
| 72 { | 72 { |
| 73 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); | 73 updateRequestForAccessControl(m_resourceRequest, allowCredentials, origin); |
| 74 ASSERT(m_options.requestOriginPolicy == UseDefaultOriginRestrictionsForType)
; // Allows only tightening from the default value. | 74 ASSERT(m_options.requestOriginPolicy == UseDefaultOriginRestrictionsForType)
; // Allows only tightening from the default value. |
| 75 m_options.requestOriginPolicy = PotentiallyCrossOriginEnabled; | 75 m_options.requestOriginPolicy = PotentiallyCrossOriginEnabled; |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace WebCore | 78 } // namespace WebCore |
| OLD | NEW |