CSP: 'frame-ancestors' should override 'x-frame-options'.

Source/core/frame/csp/CSPDirectiveList.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CSPDirectiveList_h
 #define CSPDirectiveList_h
 
 #include "core/fetch/Resource.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/frame/csp/MediaListDirective.h"
@@ skipping 52 matching lines @@
     bool allowStyleNonce(const String&) const;
     bool allowScriptHash(const CSPHashValue&) const;
     bool allowStyleHash(const CSPHashValue&) const;
 
     const String& evalDisabledErrorMessage() const { return m_evalDisabledErrorMessage; }
     ReflectedXSSDisposition reflectedXSSDisposition() const { return m_reflectedXSSDisposition; }
     ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
     bool didSetReferrerPolicy() const { return m_didSetReferrerPolicy; }
     bool isReportOnly() const { return m_reportOnly; }
     const Vector<String>& reportEndpoints() const { return m_reportEndpoints; }
+    bool isFrameAncestorsEnforced() const { return m_frameAncestors.get() && !m_reportOnly; }
 
     // Used to copy plugin-types into a plugin document in a nested
     // browsing context.
     bool hasPluginTypes() const { return !!m_pluginTypes; }
     const String& pluginTypesText() const;
 
     bool shouldSendCSPHeader(Resource::Type) const;
 
 private:
     CSPDirectiveList(ContentSecurityPolicy*, ContentSecurityPolicyHeaderType, ContentSecurityPolicyHeaderSource);
@@ skipping 75 matching lines @@
 
     Vector<String> m_reportEndpoints;
 
     String m_evalDisabledErrorMessage;
 };
 
 
 } // namespace
 
 #endif