wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 460063. Geolocation prompt should not appear if there are no providers installed. r=smaug. sr=bz

Browse Source
This commit is contained in:
Doug Turner 2008-11-12 07:59:38 -08:00
parent 44e438c975
commit 132a4fc71e
2 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
dom/src/geolocation/nsGeolocation.cpp
View File

@ -148,6 +148,22 @@ nsGeolocationRequest::~nsGeolocationRequest()
{
}
nsresult
nsGeolocationRequest::Init()
{
// This method is called before the user has given permission for this request.
// check to see if we have a geolocation provider, if not, notify an error and bail.
nsRefPtr<nsGeolocationService> geoService = nsGeolocationService::GetInstance();
if (!geoService->HasGeolocationProvider()) {
NotifyError(NS_GEO_ERROR_CODE_LOCATION_PROVIDER_ERROR);
return NS_ERROR_FAILURE;;
}
return NS_OK;
}
NS_INTERFACE_MAP_BEGIN(nsGeolocationRequest)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIGeolocationRequest)
NS_INTERFACE_MAP_ENTRY(nsIGeolocationRequest)
@ -402,6 +418,7 @@ NS_IMPL_THREADSAFE_ADDREF(nsGeolocationService)
NS_IMPL_THREADSAFE_RELEASE(nsGeolocationService)
nsGeolocationService::nsGeolocationService()
: mProviderStarted(PR_FALSE)
{
nsCOMPtr<nsIObserverService> obs = do_GetService("@mozilla.org/observer-service;1");
if (obs) {
@ -409,6 +426,15 @@ nsGeolocationService::nsGeolocationService()
}
mTimeout = nsContentUtils::GetIntPref("geo.timeout", 6000);
mProvider = do_GetService(NS_GEOLOCATION_PROVIDER_CONTRACTID);
// if NS_MAEMO_LOCATION, see if we should try the MAEMO location provider
#ifdef NS_MAEMO_LOCATION
if (!mProvider)
mProvider = new MaemoLocationProvider();
#endif
}
nsGeolocationService::~nsGeolocationService()
@ -482,38 +508,36 @@ nsGeolocationService::IsDeviceReady()
return ready;
}
PRBool
nsGeolocationService::HasGeolocationProvider()
{
return (mProvider != nsnull);
}
nsresult
nsGeolocationService::StartDevice()
{
if (!mProvider)
{
// Check to see if there is an override in place. if so, use it.
mProvider = do_GetService(NS_GEOLOCATION_PROVIDER_CONTRACTID);
return NS_ERROR_NOT_AVAILABLE;
if (!mProviderStarted) {
// if NS_MAEMO_LOCATION, see if we should try the MAEMO location provider
#ifdef NS_MAEMO_LOCATION
if (!mProvider)
{
// guess not, lets try a default one:
mProvider = new MaemoLocationProvider();
}
#endif
if (!mProvider)
return NS_ERROR_NOT_AVAILABLE;
// if we have one, start it up.
nsresult rv = mProvider->Startup();
if (NS_FAILED(rv))
return NS_ERROR_NOT_AVAILABLE;
// lets monitor it for any changes.
mProvider->Watch(this);
// remember that we are started up
mProviderStarted = PR_TRUE;
// we do not want to keep the geolocation devices online
// indefinitely. Close them down after a reasonable period of
// inactivivity
SetDisconnectTimer();
}
return NS_OK;
@ -537,7 +561,7 @@ nsGeolocationService::StopDevice()
{
if (mProvider) {
mProvider->Shutdown();
mProvider = nsnull;
mProviderStarted = PR_FALSE;
}
if(mDisconnectTimer) {
@ -709,6 +733,9 @@ nsGeolocation::GetCurrentPosition(nsIDOMGeoPositionCallback *callback,
if (!request)
return NS_ERROR_OUT_OF_MEMORY;
if (NS_FAILED(request->Init()))
return NS_OK;
prompt->Prompt(request);
// What if you have a location provider that only sends a location once, then stops.? fix.
@ -725,11 +752,14 @@ nsGeolocation::WatchPosition(nsIDOMGeoPositionCallback *aCallback,
nsCOMPtr<nsIGeolocationPrompt> prompt = do_GetService(NS_GEOLOCATION_PROMPT_CONTRACTID);
if (prompt == nsnull)
return NS_ERROR_NOT_AVAILABLE;
nsRefPtr<nsGeolocationRequest> request = new nsGeolocationRequest(this, aCallback, aErrorCallback, aOptions);
if (!request)
return NS_ERROR_OUT_OF_MEMORY;
if (NS_FAILED(request->Init()))
return NS_OK;
prompt->Prompt(request);
// need to hand back an index/reference.

7
dom/src/geolocation/nsGeolocation.h
View File

@ -74,6 +74,7 @@ class nsGeolocationRequest : public nsIGeolocationRequest, public nsITimerCallba
nsIDOMGeoPositionCallback* callback,
nsIDOMGeoPositionErrorCallback* errorCallback,
nsIDOMGeoPositionOptions* options);
nsresult Init();
void Shutdown();
void SendLocation(nsIDOMGeoPosition* location);
@ -145,6 +146,9 @@ public:
// geolocation device
PRBool IsDeviceReady();
// Returns true if there is a geolocation provider registered.
PRBool HasGeolocationProvider();
// Find and startup a geolocation device (gps, nmea, etc.)
nsresult StartDevice();
@ -169,6 +173,9 @@ private:
// The object providing geo location information to us.
nsCOMPtr<nsIGeolocationProvider> mProvider;
// A flag that lets us know if the mProvider has been started up.
PRBool mProviderStarted;
// mGeolocators are not owned here. Their constructor
// addes them to this list, and their destructor removes
// them from this list.