diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-02 11:07:38 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | c640c505e202c2ba149c53d44a246ce98908130e (patch) | |
| tree | 2db5bef0b4d911d1b501d9d4b512735889b976c5 | |
| parent | 3327b402405fd9155abbcf63c0ea972f77a3d35c (diff) | |
| download | external_webkit-c640c505e202c2ba149c53d44a246ce98908130e.zip external_webkit-c640c505e202c2ba149c53d44a246ce98908130e.tar.gz external_webkit-c640c505e202c2ba149c53d44a246ce98908130e.tar.bz2 | |
Merge WebKit at r64264 : Compile fix: registerURLSchemeAsLocal moved
SecurityOrigin::registerURLSchemeAsLocal got moved to a new class.
http://trac.webkit.org/changeset/63863
Change-Id: If1baa94d90506a9de321ad3303545e133ee446e9
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 9d2a430..de9c30f 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -91,6 +91,7 @@ #include "RenderThemeAndroid.h" #include "RenderView.h" #include "ResourceRequest.h" +#include "SchemeRegistry.h" #include "SelectionController.h" #include "Settings.h" #include "SkANP.h" @@ -3351,7 +3352,7 @@ static void RegisterURLSchemeAsLocal(JNIEnv* env, jobject obj, jstring scheme) { #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter); #endif - WebCore::SecurityOrigin::registerURLSchemeAsLocal(to_string(env, scheme)); + WebCore::SchemeRegistry::registerURLSchemeAsLocal(to_string(env, scheme)); } static bool FocusBoundsChanged(JNIEnv* env, jobject obj) |