summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/webframe_impl.cc2
-rw-r--r--webkit/glue/webview_impl.cc5
3 files changed, 5 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 080feb7..3d00be5 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49206",
+ "webkit_revision": "49213",
"ffmpeg_revision": "27457",
}
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