From a59391482883479a9b28a6f1ace6d1ebd08a7ecd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 9 Nov 2012 09:42:44 +0100 Subject: Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025) New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2. --- Source/WebCore/loader/FrameLoader.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Source/WebCore/loader/FrameLoader.cpp') diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp index c1da44547..cc5696cdc 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -742,7 +742,7 @@ void FrameLoader::checkCompleted() m_shouldCallCheckCompleted = false; if (m_frame->view()) - m_frame->view()->checkFlushDeferredRepaintsAfterLoadComplete(); + m_frame->view()->handleLoadCompleted(); // Have we completed before? if (m_isComplete) @@ -779,7 +779,7 @@ void FrameLoader::checkCompleted() checkLoadComplete(); if (m_frame->view()) - m_frame->view()->checkFlushDeferredRepaintsAfterLoadComplete(); + m_frame->view()->handleLoadCompleted(); } void FrameLoader::checkTimerFired(Timer*) @@ -2900,7 +2900,7 @@ void FrameLoader::applyUserAgent(ResourceRequest& request) request.setHTTPUserAgent(userAgent); } -bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, const KURL& url) +bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, const KURL& url, unsigned long requestIdentifier) { Frame* topFrame = m_frame->tree()->top(); if (m_frame == topFrame) @@ -2908,11 +2908,13 @@ bool FrameLoader::shouldInterruptLoadForXFrameOptions(const String& content, con if (equalIgnoringCase(content, "deny")) return true; - - if (equalIgnoringCase(content, "sameorigin")) { + else if (equalIgnoringCase(content, "sameorigin")) { RefPtr origin = SecurityOrigin::create(url); if (!origin->isSameSchemeHostPort(topFrame->document()->securityOrigin())) return true; + } else { + String message = "Invalid 'X-Frame-Options' header encountered when loading '" + url.string() + "': '" + content + "' is not a recognized directive. The header will be ignored."; + m_frame->document()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, url.string(), 0, 0, requestIdentifier); } return false; -- cgit v1.2.1