| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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( | 102 void SecurityContext::setFeaturePolicyFromHeader( |
| 103 const WebParsedFeaturePolicy& parsedHeader, | 103 const WebParsedFeaturePolicyHeader& parsedHeader, |
| 104 FeaturePolicy* parentFeaturePolicy) { | 104 FeaturePolicy* parentFeaturePolicy) { |
| 105 DCHECK(!m_featurePolicy); | 105 DCHECK(!m_featurePolicy); |
| 106 m_featurePolicy = FeaturePolicy::createFromParentPolicy(parentFeaturePolicy, | 106 m_featurePolicy = FeaturePolicy::createFromParentPolicy(parentFeaturePolicy, |
| 107 m_securityOrigin); | 107 m_securityOrigin); |
| 108 m_featurePolicy->setHeaderPolicy(parsedHeader); | 108 m_featurePolicy->setHeaderPolicy(parsedHeader); |
| 109 } | 109 } |
| 110 | 110 |
| 111 } // namespace blink | 111 } // namespace blink |
| OLD | NEW |