diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebCore/loader/MainResourceLoader.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebCore/loader/MainResourceLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/MainResourceLoader.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp index 485aaa2c1..334d64895 100644 --- a/Source/WebCore/loader/MainResourceLoader.cpp +++ b/Source/WebCore/loader/MainResourceLoader.cpp @@ -44,7 +44,9 @@ #include "HTMLFormElement.h" #include "HistoryItem.h" #include "InspectorInstrumentation.h" +#include "LoaderStrategy.h" #include "Page.h" +#include "PlatformStrategies.h" #include "ResourceError.h" #include "ResourceHandle.h" #include "ResourceLoadScheduler.h" @@ -371,8 +373,8 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r) 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"))); - m_frame->document()->domWindow()->console()->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, consoleMessage); + String message = "Refused to display '" + r.url().string() + "' in a frame because it set 'X-Frame-Options' to '" + content + "'."; + m_frame->document()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, r.url().string(), 0, 0, identifier()); cancel(); return; @@ -630,8 +632,13 @@ bool MainResourceLoader::loadNow(ResourceRequest& r) if (shouldLoadEmptyBeforeRedirect && !shouldLoadEmpty && defersLoading()) return true; +#if USE(PLATFORM_STRATEGIES) + platformStrategies()->loaderStrategy()->resourceLoadScheduler()->addMainResourceLoad(this); +#else resourceLoadScheduler()->addMainResourceLoad(this); - if (m_substituteData.isValid()) +#endif + + if (m_substituteData.isValid()) handleSubstituteDataLoadSoon(r); else if (shouldLoadEmpty || frameLoader()->client()->representationExistsForURLScheme(url.protocol())) handleEmptyLoad(url, !shouldLoadEmpty); |