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 /WebCore/page/Geolocation.h | |
| 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 'WebCore/page/Geolocation.h')
| -rw-r--r-- | WebCore/page/Geolocation.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h index 3006b29..808ee9c 100644 --- a/WebCore/page/Geolocation.h +++ b/WebCore/page/Geolocation.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved. + * Copyright 2010, The Android Open Source Project * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,6 +28,7 @@ #define Geolocation_h #include "EventListener.h" +#include "GeolocationPositionCache.h" #include "GeolocationService.h" #include "Geoposition.h" #include "PositionCallback.h" @@ -46,7 +48,6 @@ namespace WebCore { class Frame; -class CachedPositionManager; #if ENABLE(CLIENT_BASED_GEOLOCATION) class GeolocationPosition; @@ -86,8 +87,6 @@ public: void setError(GeolocationError*); #endif - static void setDatabasePath(String); - private: Geolocation(Frame*); @@ -184,7 +183,7 @@ private: } m_allowGeolocation; bool m_shouldClearCache; - CachedPositionManager* m_cachedPositionManager; + OwnPtr<GeolocationPositionCache> m_positionCache; GeoNotifierSet m_requestsAwaitingCachedPosition; }; |