diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
| commit | ee4c86d1990a9e26277a6948e7027ad8d525ebfa (patch) | |
| tree | 1e2d3408cd097606571f40ab63353c27bcb7dd5c /Source/WebCore/loader/MainResourceLoader.cpp | |
| parent | d882bec96d0d30aeeda2141bfadfca7f038ee862 (diff) | |
| download | qtwebkit-ee4c86d1990a9e26277a6948e7027ad8d525ebfa.tar.gz | |
Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718)
New snapshot that includes the return of -fkeep-memory at link time
to reduce memory pressure as well as modularized documentation
Diffstat (limited to 'Source/WebCore/loader/MainResourceLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/MainResourceLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/MainResourceLoader.cpp b/Source/WebCore/loader/MainResourceLoader.cpp index 1f9bb4652..485aaa2c1 100644 --- a/Source/WebCore/loader/MainResourceLoader.cpp +++ b/Source/WebCore/loader/MainResourceLoader.cpp @@ -236,7 +236,7 @@ void MainResourceLoader::willSendRequest(ResourceRequest& newRequest, const Reso Frame* top = m_frame->tree()->top(); if (top != m_frame) { - if (!frameLoader()->checkIfDisplayInsecureContent(top->document()->securityOrigin(), newRequest.url())) { + if (!frameLoader()->mixedContentChecker()->canDisplayInsecureContent(top->document()->securityOrigin(), newRequest.url())) { cancel(); return; } |