diff options
Diffstat (limited to 'WebKit/android')
-rw-r--r-- | WebKit/android/WebCoreSupport/FileSystemClient.h | 2 | ||||
-rw-r--r-- | WebKit/android/WebCoreSupport/PlatformBridge.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/WebKit/android/WebCoreSupport/FileSystemClient.h b/WebKit/android/WebCoreSupport/FileSystemClient.h index 8847bda..5bde18a 100644 --- a/WebKit/android/WebCoreSupport/FileSystemClient.h +++ b/WebKit/android/WebCoreSupport/FileSystemClient.h @@ -35,7 +35,7 @@ namespace android { class FileSystemClient { public: virtual ~FileSystemClient() { } - virtual String resolveFileNameForContentUri(const String&) = 0; + virtual String resolveFilePathForContentUri(const String&) = 0; }; } #endif diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp index 006f529..b75cdfc 100644 --- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp +++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp @@ -142,10 +142,10 @@ bool PlatformBridge::popupsAllowed(NPP) return false; } -String PlatformBridge::resolveFileNameForContentUri(const String& contentUri) +String PlatformBridge::resolveFilePathForContentUri(const String& contentUri) { FileSystemClient* client = JavaSharedClient::GetFileSystemClient(); - return client->resolveFileNameForContentUri(contentUri); + return client->resolveFilePathForContentUri(contentUri); } } // namespace WebCore diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index 2d95f87..6aceb1c 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -85,7 +85,7 @@ public: virtual WTF::Vector<String> getSupportedKeyStrengthList(); virtual WebCore::String getSignedPublicKeyAndChallengeString(unsigned index, const WebCore::String& challenge, const WebCore::KURL& url); - virtual WebCore::String resolveFileNameForContentUri(const WebCore::String& uri); + virtual WebCore::String resolveFilePathForContentUri(const WebCore::String& uri); //////////////////////////////////////////// @@ -122,7 +122,7 @@ private: jmethodID mSignalFuncPtrQueue; jmethodID mGetKeyStrengthList; jmethodID mGetSignedPublicKey; - jmethodID mResolveFileNameForContentUri; + jmethodID mResolveFilePathForContentUri; }; static void (*sSharedTimerFiredCallback)(); @@ -142,7 +142,7 @@ JavaBridge::JavaBridge(JNIEnv* env, jobject obj) mSignalFuncPtrQueue = env->GetMethodID(clazz, "signalServiceFuncPtrQueue", "()V"); mGetKeyStrengthList = env->GetMethodID(clazz, "getKeyStrengthList", "()[Ljava/lang/String;"); mGetSignedPublicKey = env->GetMethodID(clazz, "getSignedPublicKey", "(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); - mResolveFileNameForContentUri = env->GetMethodID(clazz, "resolveFileNameForContentUri", "(Ljava/lang/String;)Ljava/lang/String;"); + mResolveFilePathForContentUri = env->GetMethodID(clazz, "resolveFilePathForContentUri", "(Ljava/lang/String;)Ljava/lang/String;"); LOG_ASSERT(mSetSharedTimer, "Could not find method setSharedTimer"); LOG_ASSERT(mStopSharedTimer, "Could not find method stopSharedTimer"); @@ -314,11 +314,11 @@ WebCore::String JavaBridge::getSignedPublicKeyAndChallengeString(unsigned index, return ret; } -WebCore::String JavaBridge::resolveFileNameForContentUri(const WebCore::String& uri) { +WebCore::String JavaBridge::resolveFilePathForContentUri(const WebCore::String& uri) { JNIEnv* env = JSC::Bindings::getJNIEnv(); jstring jUri = env->NewString(uri.characters(), uri.length()); AutoJObject obj = getRealObject(env, mJavaObject); - jstring path = static_cast<jstring>(env->CallObjectMethod(obj.get(), mResolveFileNameForContentUri, jUri)); + jstring path = static_cast<jstring>(env->CallObjectMethod(obj.get(), mResolveFilePathForContentUri, jUri)); WebCore::String ret = to_string(env, path); env->DeleteLocalRef(jUri); env->DeleteLocalRef(path); |