diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 13:03:38 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:34 +0100 |
| commit | a1c42b04d7f6b22071426cd6fa99482bc7b11c1d (patch) | |
| tree | 1e496668a565a5ba3fae14091b9aafed82914321 /WebKit/android | |
| parent | e329d6bccc707d262ff7eac2b5284b9a28812624 (diff) | |
| download | external_webkit-a1c42b04d7f6b22071426cd6fa99482bc7b11c1d.zip external_webkit-a1c42b04d7f6b22071426cd6fa99482bc7b11c1d.tar.gz external_webkit-a1c42b04d7f6b22071426cd6fa99482bc7b11c1d.tar.bz2 | |
Merge WebKit at r74534: Fix WebSettings.cpp
Fix our platform code after upstream refactoring to
GeolocationPositionCache.
http://trac.webkit.org/changeset/74226
Change-Id: I07202da9252741576f3133c2daa0222bc2b67e61
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 4dd183b..468e7b0 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -525,7 +525,7 @@ public: if (str) { String path = jstringToWtfString(env, str); GeolocationPermissions::setDatabasePath(path); - GeolocationPositionCache::setDatabasePath(path); + GeolocationPositionCache::instance()->setDatabasePath(path); // This database is created when the first Geolocation object is // instantiated. If the file doesn't exist, we create it and set its // permissions. The filename must match that in |