diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 11:29:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:06 +0100 |
| commit | 059ea0497a87479c013371fb9f866f9f2677b529 (patch) | |
| tree | d4da291afa9fd9dba320a976307541d82e332ec9 | |
| parent | d867a0e9b483e848580a3a98f73a8352884eac2b (diff) | |
| download | external_webkit-059ea0497a87479c013371fb9f866f9f2677b529.zip external_webkit-059ea0497a87479c013371fb9f866f9f2677b529.tar.gz external_webkit-059ea0497a87479c013371fb9f866f9f2677b529.tar.bz2 | |
Merge webkit.org at R49305 : setLocalLoadPolicy is now a member of SecurityOrigin.
See http://trac.webkit.org/changeset/49211
Change-Id: I2386a1089f9212f523b5525e2c98b081fb7bf297
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 215df37..e8ef7bf 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -82,6 +82,7 @@ #include "ResourceHandle.h" #include "ScriptController.h" #include "ScriptValue.h" +#include "SecurityOrigin.h" #include "SelectionController.h" #include "Settings.h" #include "SubstituteData.h" @@ -928,8 +929,8 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss frame->selection()->setFocused(true); // Allow local access to file:/// and substitute data - WebCore::FrameLoader::setLocalLoadPolicy( - WebCore::FrameLoader::AllowLocalLoadsForLocalAndSubstituteData); + WebCore::SecurityOrigin::setLocalLoadPolicy( + WebCore::SecurityOrigin::AllowLocalLoadsForLocalAndSubstituteData); LOGV("::WebCore:: createFrame %p", frame); |