summaryrefslogtreecommitdiff
path: root/Source/WebCore/loader/MainResourceLoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/loader/MainResourceLoader.cpp')
-rw-r--r--Source/WebCore/loader/MainResourceLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp
index ea667036c..1f9bb4652 100644
--- a/Source/WebCore/loader/MainResourceLoader.cpp
+++ b/Source/WebCore/loader/MainResourceLoader.cpp
@@ -368,7 +368,7 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
HTTPHeaderMap::const_iterator it = r.httpHeaderFields().find(AtomicString("x-frame-options"));
if (it != r.httpHeaderFields().end()) {
- String content = it->second;
+ String content = it->value;
if (m_frame->loader()->shouldInterruptLoadForXFrameOptions(content, r.url())) {
InspectorInstrumentation::continueAfterXFrameOptionsDenied(m_frame.get(), documentLoader(), identifier(), r);
DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to display document because display forbidden by X-Frame-Options.\n")));
@@ -386,7 +386,7 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
#endif
if (m_loadingMultipartContent) {
- frameLoader()->activeDocumentLoader()->setupForReplaceByMIMEType(r.mimeType());
+ m_documentLoader->setupForReplace();
clearResourceData();
}