Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2011 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 | 92 |
| 93 DCHECK(!suborigin.name().isEmpty()); | 93 DCHECK(!suborigin.name().isEmpty()); |
| 94 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); | 94 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); |
| 95 DCHECK(m_securityOrigin.get()); | 95 DCHECK(m_securityOrigin.get()); |
| 96 DCHECK(!m_securityOrigin->hasSuborigin() || | 96 DCHECK(!m_securityOrigin->hasSuborigin() || |
| 97 m_securityOrigin->suborigin()->name() == suborigin.name()); | 97 m_securityOrigin->suborigin()->name() == suborigin.name()); |
| 98 m_securityOrigin->addSuborigin(suborigin); | 98 m_securityOrigin->addSuborigin(suborigin); |
| 99 didUpdateSecurityOrigin(); | 99 didUpdateSecurityOrigin(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void SecurityContext::setFeaturePolicyFromHeader( | |
| 103 const String& headerValue, | |
| 104 SecurityContext* parentSecurityContext, | |
| 105 Vector<String>* messages) { | |
|
raymes
2016/11/21 02:17:34
I think we should DCHECK(!m_featurePolicy) here?
iclelland
2016/11/21 05:05:33
To ensure that it hasn't been set previously -- ce
| |
| 106 m_featurePolicy = FeaturePolicy::createFromParentPolicy( | |
| 107 (parentSecurityContext ? parentSecurityContext->getFeaturePolicy() | |
| 108 : nullptr), | |
| 109 m_securityOrigin); | |
| 110 m_featurePolicy->setHeaderPolicy(headerValue, messages); | |
| 111 } | |
| 112 | |
| 102 } // namespace blink | 113 } // namespace blink |
| OLD | NEW |