diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/loader/SubresourceLoader.cpp | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/loader/SubresourceLoader.cpp')
| -rw-r--r-- | WebCore/loader/SubresourceLoader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/loader/SubresourceLoader.cpp b/WebCore/loader/SubresourceLoader.cpp index 047cc6d..2ee4626 100644 --- a/WebCore/loader/SubresourceLoader.cpp +++ b/WebCore/loader/SubresourceLoader.cpp @@ -33,6 +33,7 @@ #include "Frame.h" #include "FrameLoader.h" #include "ResourceHandle.h" +#include "SecurityOrigin.h" #include "SubresourceLoaderClient.h" #include <wtf/RefCountedLeakCounter.h> @@ -72,13 +73,13 @@ PassRefPtr<SubresourceLoader> SubresourceLoader::create(Frame* frame, Subresourc ResourceRequest newRequest = request; if (!skipCanLoadCheck - && FrameLoader::restrictAccessToLocal() - && !FrameLoader::canLoad(request.url(), String(), frame->document())) { + && SecurityOrigin::restrictAccessToLocal() + && !SecurityOrigin::canLoad(request.url(), String(), frame->document())) { FrameLoader::reportLocalLoadFailed(frame, request.url().string()); return 0; } - if (FrameLoader::shouldHideReferrer(request.url(), fl->outgoingReferrer())) + if (SecurityOrigin::shouldHideReferrer(request.url(), fl->outgoingReferrer())) newRequest.clearHTTPReferrer(); else if (!request.httpReferrer()) newRequest.setHTTPReferrer(fl->outgoingReferrer()); |