summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-25 18:03:49 +0000
committerSteve Block <steveblock@google.com>2010-01-25 18:49:31 +0000
commit8a03f7cd9e884b3db11bb5485b4d9f5095dc0bca (patch)
treecfa1482c9769390fe06bfca99d85c0daabf6532d /WebKit/android
parentf194ee8ea5e8e00930a6caddc3ef6f5031493c2b (diff)
downloadexternal_webkit-8a03f7cd9e884b3db11bb5485b4d9f5095dc0bca.zip
external_webkit-8a03f7cd9e884b3db11bb5485b4d9f5095dc0bca.tar.gz
external_webkit-8a03f7cd9e884b3db11bb5485b4d9f5095dc0bca.tar.bz2
Moves the Geolocation position cache out of the Geolocation object.
The position cache is an implementation detail of the Geolocation object, but is being moved to its own file to keep files to a reasonable size. Also updates some names and fixes soem style. This will be upstreamed in https://bugs.webkit.org/show_bug.cgi?id=34084 The maximumAge code in the Geolocation object, which may make use of this caching, is being upstreamed in https://bugs.webkit.org/show_bug.cgi?id=30676 Change-Id: I083556de732bd7be240a75da5369117aabc50e33
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/jni/WebSettings.cpp4
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);