TBR: darin

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29642 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 28 insertions, 0 deletions

diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp
index 7a04fe6..c0ea7a3 100644
--- a/webkit/api/src/WebKit.cpp
+++ b/webkit/api/src/WebKit.cpp
@@ -32,10 +32,13 @@
 #include "WebKit.h"
 
 #include "WebMediaPlayerClientImpl.h"
+#include "WebString.h"
 
 #include "AtomicString.h"
 #include "DOMTimer.h"
+#include "FrameLoader.h"
 #include "Page.h"
+#include "SecurityOrigin.h"
 #include "TextEncoding.h"
 #include "WebSocket.h"
 #include "WorkerContextExecutionProxy.h"
@@ -94,6 +97,16 @@ bool layoutTestMode()
     return s_layoutTestMode;
 }
 
+void registerURLSchemeAsLocal(const WebString& scheme)
+{
+    WebCore::SecurityOrigin::registerURLSchemeAsLocal(scheme);
+}
+
+void registerURLSchemeAsNoAccess(const WebString& scheme)
+{
+    WebCore::SecurityOrigin::registerURLSchemeAsNoAccess(scheme);
+}
+
 void enableMediaPlayer()
 {
 #if ENABLE(VIDEO)
@@ -118,6 +131,21 @@ bool databasesEnabled()
     return s_databasesEnabled;
 }
 
+void whiteListAccessFromOrigin(const WebURL& sourceOrigin,
+                               const WebString& destinationProtocol,
+                               const WebString& destinationHost,
+                               bool allowDestinationSubdomains)
+{
+    WebCore::SecurityOrigin::whiteListAccessFromOrigin(
+        *WebCore::SecurityOrigin::create(sourceOrigin), destinationProtocol,
+        destinationHost, allowDestinationSubdomains);
+}
+
+void resetOriginAccessWhiteLists()
+{
+    WebCore::SecurityOrigin::resetOriginAccessWhiteLists();
+}
+
 void enableWebSockets()
 {
 #if ENABLE(WEB_SOCKETS)