| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 DCHECK(!suborigin.name().isEmpty()); | 95 DCHECK(!suborigin.name().isEmpty()); |
| 96 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); | 96 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); |
| 97 DCHECK(m_securityOrigin.get()); | 97 DCHECK(m_securityOrigin.get()); |
| 98 DCHECK(!m_securityOrigin->hasSuborigin() || | 98 DCHECK(!m_securityOrigin->hasSuborigin() || |
| 99 m_securityOrigin->suborigin()->name() == suborigin.name()); | 99 m_securityOrigin->suborigin()->name() == suborigin.name()); |
| 100 m_securityOrigin->addSuborigin(suborigin); | 100 m_securityOrigin->addSuborigin(suborigin); |
| 101 didUpdateSecurityOrigin(); | 101 didUpdateSecurityOrigin(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void SecurityContext::initializeFeaturePolicy( | 104 void SecurityContext::initializeFeaturePolicy( |
| 105 const WebParsedFeaturePolicyHeader& parsedHeader, | 105 const WebParsedFeaturePolicy& parsedHeader, |
| 106 const WebFeaturePolicy* parentFeaturePolicy) { | 106 const WebFeaturePolicy* parentFeaturePolicy) { |
| 107 DCHECK(!m_featurePolicy); | 107 DCHECK(!m_featurePolicy); |
| 108 // TODO(iclelland): Use the frame owner properties here to pass the frame | 108 // TODO(iclelland): Use the frame owner properties here to pass the frame |
| 109 // policy, if it exists. | 109 // policy, if it exists. |
| 110 WebParsedFeaturePolicyHeader containerPolicy; | 110 WebParsedFeaturePolicy containerPolicy; |
| 111 WebSecurityOrigin origin = WebSecurityOrigin(m_securityOrigin); | 111 WebSecurityOrigin origin = WebSecurityOrigin(m_securityOrigin); |
| 112 m_featurePolicy.reset(Platform::current()->createFeaturePolicy( | 112 m_featurePolicy.reset(Platform::current()->createFeaturePolicy( |
| 113 parentFeaturePolicy, containerPolicy, parsedHeader, origin)); | 113 parentFeaturePolicy, containerPolicy, parsedHeader, origin)); |
| 114 } | 114 } |
| 115 | 115 |
| 116 void SecurityContext::updateFeaturePolicyOrigin() { | 116 void SecurityContext::updateFeaturePolicyOrigin() { |
| 117 if (!m_featurePolicy) | 117 if (!m_featurePolicy) |
| 118 return; | 118 return; |
| 119 m_featurePolicy.reset(Platform::current()->duplicateFeaturePolicyWithOrigin( | 119 m_featurePolicy.reset(Platform::current()->duplicateFeaturePolicyWithOrigin( |
| 120 *m_featurePolicy, WebSecurityOrigin(m_securityOrigin))); | 120 *m_featurePolicy, WebSecurityOrigin(m_securityOrigin))); |
| 121 } | 121 } |
| 122 | 122 |
| 123 } // namespace blink | 123 } // namespace blink |
| OLD | NEW |