Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
index f17bb791a94af1a3547f8417069ebef192336a70..393fdd5c4e21e27220eb1d113d9c113fc8015b96 100644 |
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp |
@@ -454,23 +454,6 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse |
return; |
} |
- // 'frame-ancestors' obviates 'x-frame-options': https://w3c.github.io/webappsec/specs/content-security-policy/#frame-ancestors-and-frame-options |
- if (!m_contentSecurityPolicy->isFrameAncestorsEnforced()) { |
- HTTPHeaderMap::const_iterator it = response.httpHeaderFields().find(HTTPNames::X_Frame_Options); |
- if (it != response.httpHeaderFields().end()) { |
- String content = it->value; |
- if (frameLoader()->shouldInterruptLoadForXFrameOptions(content, response.url(), mainResourceIdentifier())) { |
- String message = "Refused to display '" + response.url().elidedString() + "' in a frame because it set 'X-Frame-Options' to '" + content + "'."; |
- RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message); |
- consoleMessage->setRequestIdentifier(mainResourceIdentifier()); |
- frame()->document()->addConsoleMessage(consoleMessage.release()); |
- |
- cancelLoadAfterXFrameOptionsOrCSPDenied(response); |
- return; |
- } |
- } |
- } |
- |
ASSERT(!mainResourceLoader() || !mainResourceLoader()->defersLoading()); |
m_response = response; |