From d8cf2ab022a92a9ce4960f9376b878ab901a360a Mon Sep 17 00:00:00 2001 From: "jparent@chromium.org" Date: Wed, 7 Oct 2009 03:48:09 +0000 Subject: Webkit roll: 49206:49213. TEST=try servers BUG=none TBR=johnnyg Review URL: http://codereview.chromium.org/266001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28230 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webframe_impl.cc | 2 +- webkit/glue/webview_impl.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'webkit') diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index 092bfc0..3172952 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -873,7 +873,7 @@ void WebFrameImpl::setReferrerForRequest( } else { referrer = webkit_glue::WebStringToString(referrer_url.spec().utf16()); } - if (FrameLoader::shouldHideReferrer( + if (SecurityOrigin::shouldHideReferrer( webkit_glue::WebURLToKURL(request.url()), referrer)) return; request.setHTTPHeaderField(WebString::fromUTF8("Referer"), diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 945bfbc..9234e25 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -50,6 +50,7 @@ MSVC_PUSH_WARNING_LEVEL(0); #endif #include "RenderView.h" #include "ResourceHandle.h" +#include "SecurityOrigin.h" #include "SelectionController.h" #include "Settings.h" #include "TypingCommand.h" @@ -357,8 +358,8 @@ void WebViewImpl::initializeMainFrame(WebFrameClient* frame_client) { // Restrict the access to the local file system // (see WebView.mm WebView::_commonInitializationWithFrameName). - FrameLoader::setLocalLoadPolicy( - FrameLoader::AllowLocalLoadsForLocalOnly); + SecurityOrigin::setLocalLoadPolicy( + SecurityOrigin::AllowLocalLoadsForLocalOnly); } // static -- cgit v1.1