From 45b64f60af3cbfa8c78388e35e9b669a0c284bdc Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 18:17:05 +0100 Subject: Merge WebKit at r65072: String class has moved to the WTF namespace. See http://trac.webkit.org/changeset/65021 Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549 --- WebKit/android/jni/GeolocationPermissionsBridge.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'WebKit/android/jni/GeolocationPermissionsBridge.cpp') diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp index a9f79b0..f623718 100755 --- a/WebKit/android/jni/GeolocationPermissionsBridge.cpp +++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp @@ -59,19 +59,19 @@ static jobject getOrigins(JNIEnv* env, jobject obj) static bool getAllowed(JNIEnv* env, jobject obj, jstring origin) { - WebCore::String originString = to_string(env, origin); + WTF::String originString = to_string(env, origin); return GeolocationPermissions::getAllowed(originString); } static void clear(JNIEnv* env, jobject obj, jstring origin) { - WebCore::String originString = to_string(env, origin); + WTF::String originString = to_string(env, origin); GeolocationPermissions::clear(originString); } static void allow(JNIEnv* env, jobject obj, jstring origin) { - WebCore::String originString = to_string(env, origin); + WTF::String originString = to_string(env, origin); GeolocationPermissions::allow(originString); } -- cgit v1.1