diff options
| author | Steve Block <steveblock@google.com> | 2010-01-26 08:33:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-26 08:33:05 -0800 |
| commit | ab3eedd7e7e8a8ab78e3a507f85afcc6353461b0 (patch) | |
| tree | e2253fcad018ce7b3b217fb46f78eb14e15833ce /WebKit/android | |
| parent | d5ebf563d1a5ecc4473fc05753abec894087fedd (diff) | |
| parent | 8a03f7cd9e884b3db11bb5485b4d9f5095dc0bca (diff) | |
| download | external_webkit-ab3eedd7e7e8a8ab78e3a507f85afcc6353461b0.zip external_webkit-ab3eedd7e7e8a8ab78e3a507f85afcc6353461b0.tar.gz external_webkit-ab3eedd7e7e8a8ab78e3a507f85afcc6353461b0.tar.bz2 | |
Merge "Moves the Geolocation position cache out of the Geolocation object."
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 00fec85..50919b6 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -35,8 +35,8 @@ #include "Frame.h" #include "FrameLoader.h" #include "FrameView.h" -#include "Geolocation.h" #include "GeolocationPermissions.h" +#include "GeolocationPositionCache.h" #include "Page.h" #include "PageCache.h" #include "RenderTable.h" @@ -366,7 +366,7 @@ public: str = (jstring)env->GetObjectField(obj, gFieldIds->mGeolocationDatabasePath); if (str) { GeolocationPermissions::setDatabasePath(to_string(env,str)); - WebCore::Geolocation::setDatabasePath(to_string(env,str)); + WebCore::GeolocationPositionCache::setDatabasePath(to_string(env,str)); } size = env->GetIntField(obj, gFieldIds->mPageCacheCapacity); |