mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-16 22:04:36 +00:00
Bug 1278410 - The Geolocation fuzzing implementation has been removed. r=dougt
MozReview-Commit-ID: 6x4Z4IayvCt --HG-- extra : transplant_source : M%E0%3E%12%84%D7%0DQBT%91%08%7B%D7%8D%7Cyfc%9B
This commit is contained in:
Michelangelo De Simone
parent
0cfcbe16b4
commit
b094f2be2a
@ -5,7 +5,6 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXPORTS += [
|
||||
'nsGeolocationSettings.h',
|
||||
'nsGeoPosition.h',
|
||||
'nsGeoPositionIPCSerialiser.h',
|
||||
]
|
||||
@ -16,8 +15,6 @@ SOURCES += [
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'MLSFallback.cpp',
|
||||
'nsGeoGridFuzzer.cpp',
|
||||
'nsGeolocationSettings.cpp',
|
||||
'nsGeoPosition.cpp',
|
||||
]
|
||||
|
||||
|
||||
@ -1,137 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
|
||||
#include <math.h>
|
||||
#include "nsGeoGridFuzzer.h"
|
||||
#include "nsGeoPosition.h"
|
||||
|
||||
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
|
||||
/* The following constants are taken from the World Geodetic System 1984 (WGS84)
|
||||
* reference model for the earth ellipsoid [1]. The values in the model are
|
||||
* an accepted standard for GPS and other navigational systems.
|
||||
*
|
||||
* [1] http://www.oosa.unvienna.org/pdf/icg/2012/template/WGS_84.pdf
|
||||
*/
|
||||
#define WGS84_a (6378137.0) // equitorial axis
|
||||
#define WGS84_b (6356752.314245179) // polar axis (a * (1-f))
|
||||
#define WGS84_f (1.0/298.257223563) // inverse flattening
|
||||
#define WGS84_EPSILON (5.72957795e-9) // 1e-10 radians in degrees
|
||||
#define sq(f) ((f) * (f))
|
||||
#define sign(f) (((f) < 0) ? -1 : 1)
|
||||
|
||||
/* if you have an ellipsoid with semi-major axis A and semi-minor axis B, the
|
||||
* radius at angle phi along the semi-major axis can be calculated with this
|
||||
* formula. by using the WGS84 values for A and B, we calculate the radius of
|
||||
* earth, given the angle of latitude, phi.*/
|
||||
#define LON_RADIUS(phi) (sqrt((sq(sq(WGS84_a) * cos(phi)) + sq(sq(WGS84_b) * sin(phi))) / \
|
||||
(sq(WGS84_a * cos(phi)) + sq(WGS84_b * sin(phi)))))
|
||||
/* the radius of earth changes as a function of latitude, to simplify I am
|
||||
* assuming the fixed radius of the earth halfway between the poles and the
|
||||
* equator. this is calculated from LON_RADIUS(M_PI/4), or the radius at
|
||||
* 45 degrees N.*/
|
||||
#define LAT_RADIUS (6367489.543863)
|
||||
|
||||
/* This function figures out the latitudinal grid square that the given
|
||||
* latitude coordinate falls into and then returns the latitudinal center of
|
||||
* that grid square. It handles the proper wrapping at the poles +/- 90
|
||||
* (e.g. +95 wraps to +85 and -95 wraps to -85) */
|
||||
static double GridAlgorithmLat(int32_t aDistMeters, double aLatDeg)
|
||||
{
|
||||
/* switch to radians */
|
||||
double phi = (aLatDeg * M_PI) / 180;
|
||||
|
||||
/* properly wrap the latitude */
|
||||
phi = atan(sin(phi) / fabs(cos(phi)));
|
||||
|
||||
/* calculate grid size in radians */
|
||||
double gridSizeRad = aDistMeters / LAT_RADIUS;
|
||||
|
||||
/* find the southern edge, in radians, of the grid cell, then add half of a
|
||||
* grid cell to find the center latitude in radians */
|
||||
double gridCenterPhi = gridSizeRad * floor(phi / gridSizeRad) + gridSizeRad / 2;
|
||||
|
||||
/* properly wrap it and return it in degrees */
|
||||
return atan(sin(gridCenterPhi) / fabs(cos(gridCenterPhi))) * (180.0 / M_PI);
|
||||
}
|
||||
|
||||
/* This function figures out the longitudinal grid square that the given longitude
|
||||
* coordinate falls into and then returns the longitudinal center of that grid
|
||||
* square. It handles the proper wrapping at +/- 180 (e.g. +185 wraps to -175
|
||||
* and -185 wraps to +175) */
|
||||
static double GridAlgorithmLon(int32_t aDistMeters, double aLatDeg, double aLonDeg)
|
||||
{
|
||||
/* switch to radians */
|
||||
double phi = (aLatDeg * M_PI) / 180;
|
||||
double theta = (aLonDeg * M_PI) / 180;
|
||||
|
||||
/* properly wrap the lat/lon */
|
||||
phi = atan(sin(phi) / fabs(cos(phi)));
|
||||
theta = atan2(sin(theta), cos(theta));
|
||||
|
||||
/* calculate grid size in radians */
|
||||
double gridSizeRad = aDistMeters / LON_RADIUS(phi);
|
||||
|
||||
/* find the western edge, in radians, of the grid cell, then add half of a
|
||||
* grid cell to find the center longitude in radians */
|
||||
double gridCenterTheta = gridSizeRad * floor(theta / gridSizeRad) + gridSizeRad / 2;
|
||||
|
||||
/* properly wrap it and return it in degrees */
|
||||
return atan2(sin(gridCenterTheta), cos(gridCenterTheta)) * (180.0 / M_PI);
|
||||
}
|
||||
|
||||
/* This function takes the grid size and the graticule coordinates of a
|
||||
* location and calculates which grid cell the coordinates fall within and
|
||||
* then returns the coordinates of the geographical center of the grid square.
|
||||
*/
|
||||
static void CalculateGridCoords(int32_t aDistKm, double& aLatDeg, double& aLonDeg)
|
||||
{
|
||||
// a grid size of 0 is the same as precise
|
||||
if (aDistKm == 0) {
|
||||
return;
|
||||
}
|
||||
aLonDeg = GridAlgorithmLon(aDistKm * 1000, aLatDeg, aLonDeg);
|
||||
aLatDeg = GridAlgorithmLat(aDistKm * 1000, aLatDeg);
|
||||
}
|
||||
|
||||
already_AddRefed<nsIDOMGeoPosition>
|
||||
nsGeoGridFuzzer::FuzzLocation(const GeolocationSetting & aSetting,
|
||||
nsIDOMGeoPosition * aPosition)
|
||||
{
|
||||
if (!aPosition) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIDOMGeoPositionCoords> coords;
|
||||
nsresult rv = aPosition->GetCoords(getter_AddRefs(coords));
|
||||
NS_ENSURE_SUCCESS(rv, nullptr);
|
||||
if (!coords) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
double lat = 0.0, lon = 0.0;
|
||||
coords->GetLatitude(&lat);
|
||||
coords->GetLongitude(&lon);
|
||||
|
||||
// adjust lat/lon to be the center of the grid square
|
||||
CalculateGridCoords(aSetting.GetApproxDistance(), lat, lon);
|
||||
GPSLOG("approximate location with delta %d is %f, %f",
|
||||
aSetting.GetApproxDistance(), lat, lon);
|
||||
|
||||
// reusing the timestamp
|
||||
DOMTimeStamp ts;
|
||||
rv = aPosition->GetTimestamp(&ts);
|
||||
NS_ENSURE_SUCCESS(rv, nullptr);
|
||||
|
||||
// return a position at sea level, N heading, 0 speed, 0 error.
|
||||
RefPtr<nsGeoPosition> pos = new nsGeoPosition(lat, lon, 0.0, 0.0,
|
||||
0.0, 0.0, 0.0, ts);
|
||||
return pos.forget();
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,26 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef nsGeoGridFuzzer_h
|
||||
#define nsGeoGridFuzzer_h
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIDOMGeoPosition.h"
|
||||
#include "nsGeolocationSettings.h"
|
||||
|
||||
class nsGeoGridFuzzer final
|
||||
{
|
||||
public:
|
||||
|
||||
static already_AddRefed<nsIDOMGeoPosition>
|
||||
FuzzLocation(const GeolocationSetting& aSetting, nsIDOMGeoPosition* aPosition);
|
||||
|
||||
private:
|
||||
nsGeoGridFuzzer() {} // can't construct
|
||||
nsGeoGridFuzzer(const nsGeoGridFuzzer&) {} // can't copy
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -12,8 +12,6 @@
|
||||
#include "nsISettingsService.h"
|
||||
|
||||
#include "nsGeolocation.h"
|
||||
#include "nsGeoGridFuzzer.h"
|
||||
#include "nsGeolocationSettings.h"
|
||||
#include "nsDOMClassInfoID.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
@ -36,9 +34,6 @@
|
||||
#include "mozilla/dom/SettingChangeNotificationBinding.h"
|
||||
#include "mozilla/dom/WakeLock.h"
|
||||
|
||||
#include "nsJSUtils.h"
|
||||
#include "prdtoa.h"
|
||||
|
||||
class nsIPrincipal;
|
||||
|
||||
#ifdef MOZ_ENABLE_QT5GEOPOSITION
|
||||
@ -66,7 +61,7 @@ class nsIPrincipal;
|
||||
// that a window can make.
|
||||
#define MAX_GEO_REQUESTS_PER_WINDOW 1500
|
||||
|
||||
// the geolocation enabled setting
|
||||
// The settings key.
|
||||
#define GEO_SETTINGS_ENABLED "geolocation.enabled"
|
||||
|
||||
using mozilla::Unused; // <snicker>
|
||||
@ -127,8 +122,6 @@ class nsGeolocationRequest final
|
||||
|
||||
void Notify();
|
||||
|
||||
already_AddRefed<nsIDOMGeoPosition> AdjustedLocation(nsIDOMGeoPosition*);
|
||||
|
||||
bool mIsWatchPositionRequest;
|
||||
|
||||
nsCOMPtr<nsITimer> mTimeoutTimer;
|
||||
@ -173,42 +166,22 @@ public:
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
if (aName.EqualsASCII(GEO_SETTINGS_ENABLED)) {
|
||||
// The geolocation is enabled by default:
|
||||
bool value = true;
|
||||
if (aResult.isBoolean()) {
|
||||
// The geolocation is enabled by default:
|
||||
bool value = true;
|
||||
if (aResult.isBoolean()) {
|
||||
value = aResult.toBoolean();
|
||||
}
|
||||
|
||||
GPSLOG("%s set to %s",
|
||||
NS_ConvertUTF16toUTF8(aName).get(),
|
||||
(value ? "ENABLED" : "DISABLED"));
|
||||
MozSettingValue(value);
|
||||
|
||||
} else {
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
if (gs) {
|
||||
gs->HandleGeolocationSettingsChange(aName, aResult);
|
||||
}
|
||||
}
|
||||
|
||||
MozSettingValue(value);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD HandleError(const nsAString& aName) override
|
||||
{
|
||||
if (aName.EqualsASCII(GEO_SETTINGS_ENABLED)) {
|
||||
GPSLOG("Unable to get value for '" GEO_SETTINGS_ENABLED "'");
|
||||
|
||||
// Default it's enabled:
|
||||
MozSettingValue(true);
|
||||
} else {
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
if (gs) {
|
||||
gs->HandleGeolocationSettingsError(aName);
|
||||
}
|
||||
}
|
||||
NS_WARNING("Unable to get value for '" GEO_SETTINGS_ENABLED "'");
|
||||
|
||||
// Default it's enabled:
|
||||
MozSettingValue(true);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -617,65 +590,6 @@ nsGeolocationRequest::StopTimeoutTimer()
|
||||
}
|
||||
}
|
||||
|
||||
static already_AddRefed<nsIDOMGeoPosition>
|
||||
SynthesizeLocation(DOMTimeStamp aTimestamp, double aLatitude, double aLongitude)
|
||||
{
|
||||
// return a position at sea level, N heading, 0 speed, 0 error.
|
||||
RefPtr<nsGeoPosition> pos = new nsGeoPosition(aLatitude, aLongitude,
|
||||
0.0, 0.0, 0.0, 0.0, 0.0,
|
||||
aTimestamp);
|
||||
return pos.forget();
|
||||
}
|
||||
|
||||
|
||||
already_AddRefed<nsIDOMGeoPosition>
|
||||
nsGeolocationRequest::AdjustedLocation(nsIDOMGeoPosition *aPosition)
|
||||
{
|
||||
nsCOMPtr<nsIDOMGeoPosition> pos = aPosition;
|
||||
if (XRE_IsContentProcess()) {
|
||||
GPSLOG("child process just copying position");
|
||||
return pos.forget();
|
||||
}
|
||||
|
||||
// get the settings cache
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
if (!gs) {
|
||||
return pos.forget();
|
||||
}
|
||||
|
||||
// make sure ALA is enabled
|
||||
if (!gs->IsAlaEnabled()) {
|
||||
GPSLOG("ALA is disabled, returning precise location");
|
||||
return pos.forget();
|
||||
}
|
||||
|
||||
// look up the geolocation settings via the watch ID
|
||||
DOMTimeStamp ts(PR_Now() / PR_USEC_PER_MSEC);
|
||||
GeolocationSetting setting = gs->LookupGeolocationSetting(mWatchId);
|
||||
switch (setting.GetType()) {
|
||||
case GEO_ALA_TYPE_PRECISE:
|
||||
GPSLOG("returning precise location watch ID: %d", mWatchId);
|
||||
return pos.forget();
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
case GEO_ALA_TYPE_APPROX:
|
||||
GPSLOG("returning approximate location for watch ID: %d", mWatchId);
|
||||
return nsGeoGridFuzzer::FuzzLocation(setting, aPosition);
|
||||
#endif
|
||||
case GEO_ALA_TYPE_FIXED:
|
||||
GPSLOG("returning fixed location for watch ID:: %d", mWatchId);
|
||||
// use "now" as time stamp
|
||||
return SynthesizeLocation(ts, setting.GetFixedLatitude(),
|
||||
setting.GetFixedLongitude());
|
||||
case GEO_ALA_TYPE_NONE:
|
||||
GPSLOG("returning no location for watch ID: %d", mWatchId);
|
||||
// return nullptr so no location callback happens
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nsGeolocationRequest::SendLocation(nsIDOMGeoPosition* aPosition)
|
||||
{
|
||||
@ -701,12 +615,6 @@ nsGeolocationRequest::SendLocation(nsIDOMGeoPosition* aPosition)
|
||||
nsCOMPtr<nsIDOMGeoPositionCoords> coords;
|
||||
aPosition->GetCoords(getter_AddRefs(coords));
|
||||
if (coords) {
|
||||
#ifdef MOZ_GPS_DEBUG
|
||||
double lat = 0.0, lon = 0.0;
|
||||
coords->GetLatitude(&lat);
|
||||
coords->GetLongitude(&lon);
|
||||
GPSLOG("returning coordinates: %f, %f", lat, lon);
|
||||
#endif
|
||||
wrapped = new Position(ToSupports(mLocator), aPosition);
|
||||
}
|
||||
}
|
||||
@ -749,8 +657,7 @@ nsGeolocationRequest::GetPrincipal()
|
||||
NS_IMETHODIMP
|
||||
nsGeolocationRequest::Update(nsIDOMGeoPosition* aPosition)
|
||||
{
|
||||
nsCOMPtr<nsIDOMGeoPosition> pos = AdjustedLocation(aPosition);
|
||||
nsCOMPtr<nsIRunnable> ev = new RequestSendLocationEvent(pos, this);
|
||||
nsCOMPtr<nsIRunnable> ev = new RequestSendLocationEvent(aPosition, this);
|
||||
NS_DispatchToMainThread(ev);
|
||||
return NS_OK;
|
||||
}
|
||||
@ -842,29 +749,6 @@ nsresult nsGeolocationService::Init()
|
||||
RefPtr<GeolocationSettingsCallback> callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_SETTINGS_ENABLED, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// look up the geolocation settings
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_ENABLED, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_TYPE, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_APPROX_DISTANCE, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
#endif
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_FIXED_COORDS, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_APP_SETTINGS, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
callback = new GeolocationSettingsCallback();
|
||||
rv = settingsLock->Get(GEO_ALA_ALWAYS_PRECISE, callback);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
} else {
|
||||
// If we cannot obtain the settings service, we continue
|
||||
// assuming that the geolocation is enabled:
|
||||
@ -952,10 +836,6 @@ nsGeolocationService::HandleMozsettingChanged(nsISupports* aSubject)
|
||||
return;
|
||||
}
|
||||
|
||||
GPSLOG("mozsetting changed: %s == %s",
|
||||
NS_ConvertUTF16toUTF8(setting.mKey).get(),
|
||||
(setting.mValue.toBoolean() ? "TRUE" : "FALSE"));
|
||||
|
||||
HandleMozsettingValue(setting.mValue.toBoolean());
|
||||
}
|
||||
|
||||
@ -1651,7 +1531,6 @@ Geolocation::WatchPosition(GeoPositionCallback& aCallback,
|
||||
static_cast<uint8_t>(mProtocolType), true, *aRv);
|
||||
|
||||
if (!sGeoEnabled) {
|
||||
GPSLOG("request allow event");
|
||||
nsCOMPtr<nsIRunnable> ev = new RequestAllowEvent(false, request);
|
||||
NS_DispatchToMainThread(ev);
|
||||
return NS_OK;
|
||||
|
||||
@ -1,474 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "nsXULAppAPI.h"
|
||||
|
||||
#include "mozilla/dom/ContentChild.h"
|
||||
#include "mozilla/Telemetry.h"
|
||||
|
||||
#include "nsISettingsService.h"
|
||||
|
||||
#include "nsGeolocation.h"
|
||||
#include "nsGeolocationSettings.h"
|
||||
#include "nsDOMClassInfoID.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsContentPermissionHelper.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsPIDOMWindow.h"
|
||||
#include "nsThreadUtils.h"
|
||||
#include "mozilla/Services.h"
|
||||
#include "mozilla/unused.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
#include "mozilla/ClearOnShutdown.h"
|
||||
#include "mozilla/dom/PermissionMessageUtils.h"
|
||||
#include "mozilla/dom/SettingChangeNotificationBinding.h"
|
||||
|
||||
#include "nsJSUtils.h"
|
||||
#include "prdtoa.h"
|
||||
|
||||
#define GEO_ALA_TYPE_VALUE_PRECISE "precise"
|
||||
#define GEO_ALA_TYPE_VALUE_APPROX "blur"
|
||||
#define GEO_ALA_TYPE_VALUE_FIXED "user-defined"
|
||||
#define GEO_ALA_TYPE_VALUE_NONE "no-location"
|
||||
|
||||
using mozilla::Unused;
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsGeolocationSettings, nsIObserver)
|
||||
|
||||
StaticRefPtr<nsGeolocationSettings> nsGeolocationSettings::sSettings;
|
||||
|
||||
already_AddRefed<nsGeolocationSettings>
|
||||
nsGeolocationSettings::GetGeolocationSettings()
|
||||
{
|
||||
// this singleton is only needed in the parent process...
|
||||
if (XRE_IsContentProcess()) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
RefPtr<nsGeolocationSettings> result;
|
||||
if (nsGeolocationSettings::sSettings) {
|
||||
result = nsGeolocationSettings::sSettings;
|
||||
return result.forget();
|
||||
}
|
||||
|
||||
result = new nsGeolocationSettings();
|
||||
if (NS_FAILED(result->Init())) {
|
||||
return nullptr;
|
||||
}
|
||||
ClearOnShutdown(&nsGeolocationSettings::sSettings);
|
||||
nsGeolocationSettings::sSettings = result;
|
||||
return result.forget();
|
||||
}
|
||||
|
||||
nsresult nsGeolocationSettings::Init()
|
||||
{
|
||||
// query for the current settings...
|
||||
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
|
||||
if (!obs) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// hook up observers
|
||||
obs->AddObserver(this, "quit-application", false);
|
||||
obs->AddObserver(this, "mozsettings-changed", false);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGeolocationSettings::Observe(nsISupports* aSubject,
|
||||
const char* aTopic,
|
||||
const char16_t* aData)
|
||||
{
|
||||
// remove observers
|
||||
if (!strcmp("quit-application", aTopic)) {
|
||||
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
|
||||
if (obs) {
|
||||
obs->RemoveObserver(this, "quit-application");
|
||||
obs->RemoveObserver(this, "mozsettings-changed");
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (!strcmp("mozsettings-changed", aTopic)) {
|
||||
HandleMozsettingsChanged(aSubject);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
||||
GeolocationSetting
|
||||
nsGeolocationSettings::LookupGeolocationSetting(int32_t aWatchID)
|
||||
{
|
||||
nsCString *origin;
|
||||
if (!mCurrentWatches.Get(aWatchID, &origin) || !origin) {
|
||||
return mGlobalSetting;
|
||||
}
|
||||
|
||||
// if there is no per-app setting for the given origin, this will
|
||||
// set gb == nullptr
|
||||
GeolocationSetting const * const gb =
|
||||
mPerOriginSettings.Get(NS_ConvertUTF8toUTF16(*origin));
|
||||
|
||||
// return a copy of the per-app or global settings
|
||||
return gb ? *gb : mGlobalSetting;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleGeolocationSettingsChange(const nsAString& aKey,
|
||||
const JS::Value& aVal)
|
||||
{
|
||||
if (aKey.EqualsASCII(GEO_ALA_ENABLED)) {
|
||||
HandleGeolocationAlaEnabledChange(aVal);
|
||||
} else if (aKey.EqualsASCII(GEO_ALA_TYPE)) {
|
||||
mGlobalSetting.HandleTypeChange(aVal);
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
} else if (aKey.EqualsASCII(GEO_ALA_APPROX_DISTANCE)) {
|
||||
mGlobalSetting.HandleApproxDistanceChange(aVal);
|
||||
#endif
|
||||
} else if (aKey.EqualsASCII(GEO_ALA_FIXED_COORDS)) {
|
||||
mGlobalSetting.HandleFixedCoordsChange(aVal);
|
||||
} else if (aKey.EqualsASCII(GEO_ALA_APP_SETTINGS)) {
|
||||
HandleGeolocationPerOriginSettingsChange(aVal);
|
||||
} else if (aKey.EqualsASCII(GEO_ALA_ALWAYS_PRECISE)) {
|
||||
HandleGeolocationAlwaysPreciseChange(aVal);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleMozsettingsChanged(nsISupports* aSubject)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
RootedDictionary<SettingChangeNotification> setting(nsContentUtils::RootingCx());
|
||||
if (!WrappedJSToDictionary(aSubject, setting)) {
|
||||
return;
|
||||
}
|
||||
|
||||
GPSLOG("mozsettings changed: %s", NS_ConvertUTF16toUTF8(setting.mKey).get());
|
||||
|
||||
// and handle the geolocation settings change...
|
||||
HandleGeolocationSettingsChange(setting.mKey, setting.mValue);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleGeolocationSettingsError(const nsAString& aName)
|
||||
{
|
||||
if (aName.EqualsASCII(GEO_ALA_ENABLED)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_ENABLED "'");
|
||||
} else if (aName.EqualsASCII(GEO_ALA_TYPE)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_TYPE "'");
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
} else if (aName.EqualsASCII(GEO_ALA_APPROX_DISTANCE)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_APPROX_DISTANCE "'");
|
||||
#endif
|
||||
} else if (aName.EqualsASCII(GEO_ALA_FIXED_COORDS)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_FIXED_COORDS "'");
|
||||
} else if (aName.EqualsASCII(GEO_ALA_APP_SETTINGS)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_APP_SETTINGS "'");
|
||||
} else if (aName.EqualsASCII(GEO_ALA_ALWAYS_PRECISE)) {
|
||||
GPSLOG("Unable to get value for '" GEO_ALA_ALWAYS_PRECISE "'");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::PutWatchOrigin(int32_t aWatchID,
|
||||
const nsCString& aOrigin)
|
||||
{
|
||||
if (aWatchID < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
GPSLOG("mapping watch ID %d to origin %s", aWatchID, aOrigin.get());
|
||||
mCurrentWatches.Put(static_cast<uint32_t>(aWatchID), new nsCString(aOrigin));
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::RemoveWatchOrigin(int32_t aWatchID)
|
||||
{
|
||||
GPSLOG("unmapping watch ID %d", aWatchID);
|
||||
mCurrentWatches.Remove(static_cast<uint32_t>(aWatchID));
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::GetWatchOrigin(int32_t aWatchID, nsCString& aOrigin)
|
||||
{
|
||||
nsCString *str;
|
||||
if (!mCurrentWatches.Get(aWatchID, &str) || !str) {
|
||||
return;
|
||||
}
|
||||
aOrigin = *str;
|
||||
GPSLOG("returning origin %s for watch ID %d", aOrigin.get(), aWatchID);
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleGeolocationAlaEnabledChange(const JS::Value& aVal)
|
||||
{
|
||||
if (!aVal.isBoolean()) {
|
||||
return;
|
||||
}
|
||||
|
||||
mAlaEnabled = aVal.toBoolean();
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleGeolocationPerOriginSettingsChange(const JS::Value& aVal)
|
||||
{
|
||||
MOZ_ASSERT(NS_IsMainThread());
|
||||
|
||||
if (!aVal.isObject()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// clear the hash table
|
||||
mPerOriginSettings.Clear();
|
||||
|
||||
// root the object and get the global
|
||||
JS::Rooted<JSObject*> obj(nsContentUtils::RootingCx(), &aVal.toObject());
|
||||
MOZ_ASSERT(obj);
|
||||
nsIGlobalObject* global = xpc::NativeGlobal(obj);
|
||||
NS_ENSURE_TRUE_VOID(global && global->GetGlobalJSObject());
|
||||
|
||||
// because the spec requires calling getters when enumerating the key of a
|
||||
// dictionary
|
||||
AutoEntryScript aes(global, "geolocation.app_settings enumeration");
|
||||
JSContext *cx = aes.cx();
|
||||
JS::Rooted<JS::IdVector> ids(cx, JS::IdVector(cx));
|
||||
|
||||
// if we get no ids then the exception list is empty and we can return here.
|
||||
if (!JS_Enumerate(cx, obj, &ids)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// go through all of the objects in the exceptions dictionary
|
||||
for (size_t i = 0; i < ids.length(); i++) {
|
||||
JS::RootedId id(cx);
|
||||
id = ids[i];
|
||||
|
||||
// if it is an app that is always precise, skip it
|
||||
nsAutoJSString origin;
|
||||
if (!origin.init(cx, id)) {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
continue;
|
||||
}
|
||||
if (mAlwaysPreciseApps.Contains(origin)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// get the app setting object
|
||||
JS::RootedValue propertyValue(cx);
|
||||
if (!JS_GetPropertyById(cx, obj, id, &propertyValue)) {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
continue;
|
||||
}
|
||||
JS::RootedObject settingObj(cx, &propertyValue.toObject());
|
||||
|
||||
GeolocationSetting *settings = new GeolocationSetting(origin);
|
||||
GPSLOG("adding exception for %s", NS_ConvertUTF16toUTF8(origin).get());
|
||||
|
||||
// get the geolocation type
|
||||
JS::RootedValue fm(cx);
|
||||
if (JS_GetProperty(cx, settingObj, "type", &fm)) {
|
||||
settings->HandleTypeChange(fm);
|
||||
} else {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
}
|
||||
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
// get the approximate distance if there is one
|
||||
JS::RootedValue distance(cx);
|
||||
if (JS_GetProperty(cx, settingObj, "distance", &distance)) {
|
||||
settings->HandleApproxDistanceChange(distance);
|
||||
} else {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
}
|
||||
#endif
|
||||
|
||||
// get and parse the coords, if any
|
||||
JS::RootedValue coords(cx);
|
||||
if (JS_GetProperty(cx, settingObj, "coords", &coords)) {
|
||||
settings->HandleFixedCoordsChange(coords);
|
||||
} else {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
}
|
||||
|
||||
// add the per-app setting object to the hashtable
|
||||
mPerOriginSettings.Put(origin, settings);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
nsGeolocationSettings::HandleGeolocationAlwaysPreciseChange(const JS::Value& aVal)
|
||||
{
|
||||
if (!aVal.isObject()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// clear the list of apps that are always precise
|
||||
mAlwaysPreciseApps.Clear();
|
||||
|
||||
// root the object and get the global
|
||||
JS::Rooted<JSObject*> obj(nsContentUtils::RootingCx(), &aVal.toObject());
|
||||
MOZ_ASSERT(obj);
|
||||
nsIGlobalObject* global = xpc::NativeGlobal(obj);
|
||||
NS_ENSURE_TRUE_VOID(global && global->GetGlobalJSObject());
|
||||
|
||||
// the spec requires calling getters when accessing array by index
|
||||
AutoEntryScript aes(global, "geolocation.always_precise indexing");
|
||||
JSContext *cx = aes.cx();
|
||||
|
||||
bool isArray;
|
||||
if (!JS_IsArrayObject(cx, obj, &isArray) || !isArray) {
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t length;
|
||||
if (!JS_GetArrayLength(cx, obj, &length)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// process the list of apps...
|
||||
for (uint32_t i = 0; i < length; ++i) {
|
||||
JS::RootedValue value(cx);
|
||||
|
||||
if (!JS_GetElement(cx, obj, i, &value) || !value.isString()) {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
continue;
|
||||
}
|
||||
|
||||
nsAutoJSString origin;
|
||||
if (!origin.init(cx, value)) {
|
||||
JS_ClearPendingException(cx); // catch and ignore any exceptions
|
||||
continue;
|
||||
}
|
||||
|
||||
GPSLOG("adding always precise for %s", NS_ConvertUTF16toUTF8(origin).get());
|
||||
|
||||
// add the origin to the list of apps that will always receive
|
||||
// precise location information
|
||||
mAlwaysPreciseApps.AppendElement(origin);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
GeolocationSetting::HandleTypeChange(const JS::Value& aVal)
|
||||
{
|
||||
nsAutoJSString str;
|
||||
if (!str.init(aVal)) {
|
||||
return;
|
||||
}
|
||||
|
||||
GeolocationFuzzMethod fm = GEO_ALA_TYPE_DEFAULT;
|
||||
if (str.EqualsASCII(GEO_ALA_TYPE_VALUE_PRECISE)) {
|
||||
fm = GEO_ALA_TYPE_PRECISE;
|
||||
} else if (str.EqualsASCII(GEO_ALA_TYPE_VALUE_APPROX)) {
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
fm = GEO_ALA_TYPE_APPROX;
|
||||
#else
|
||||
// we are loading a profile from a build with MOZ_APPROX_LOCATION
|
||||
// enabled, then we need to force the type to a sane value
|
||||
fm = GEO_ALA_TYPE_NONE;
|
||||
#endif
|
||||
} else if (str.EqualsASCII(GEO_ALA_TYPE_VALUE_FIXED)) {
|
||||
fm = GEO_ALA_TYPE_FIXED;
|
||||
} else if (str.EqualsASCII(GEO_ALA_TYPE_VALUE_NONE)) {
|
||||
fm = GEO_ALA_TYPE_NONE;
|
||||
}
|
||||
|
||||
if ((fm >= GEO_ALA_TYPE_FIRST) && (fm <= GEO_ALA_TYPE_LAST)) {
|
||||
GPSLOG("changing type for %s to %s (%d)",
|
||||
(mOrigin.IsEmpty() ? "global" : NS_ConvertUTF16toUTF8(mOrigin).get()),
|
||||
NS_ConvertUTF16toUTF8(str).get(),
|
||||
static_cast<int>(fm));
|
||||
mFuzzMethod = fm;
|
||||
}
|
||||
|
||||
// based on the new type, we need to clean up the other settings
|
||||
switch (mFuzzMethod) {
|
||||
case GEO_ALA_TYPE_PRECISE:
|
||||
case GEO_ALA_TYPE_NONE:
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance = 0;
|
||||
#endif
|
||||
mLatitude = 0.0;
|
||||
mLongitude = 0.0;
|
||||
break;
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
case GEO_ALA_TYPE_APPROX:
|
||||
mLatitude = 0.0;
|
||||
mLongitude = 0.0;
|
||||
break;
|
||||
#endif
|
||||
case GEO_ALA_TYPE_FIXED:
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance = 0;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
void
|
||||
GeolocationSetting::HandleApproxDistanceChange(const JS::Value& aVal)
|
||||
{
|
||||
if (!aVal.isInt32()) {
|
||||
return;
|
||||
}
|
||||
|
||||
GPSLOG("changing approx distance for %s to %d",
|
||||
(mOrigin.IsEmpty() ? "global" : NS_ConvertUTF16toUTF8(mOrigin).get()),
|
||||
aVal.toInt32());
|
||||
|
||||
// set the approximate distance
|
||||
mDistance = aVal.toInt32();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void
|
||||
GeolocationSetting::HandleFixedCoordsChange(const JS::Value& aVal)
|
||||
{
|
||||
nsAutoJSString str;
|
||||
if (!str.init(aVal)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// parse the string and store the global lat/lon
|
||||
// the string is in the form of @1.2345,6.7890
|
||||
// check for leading '@' and a comma in the middle
|
||||
int32_t const comma = str.Find(",");
|
||||
if ( (str.CharAt(0) != '@') || (comma == -1) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
// pull the lat and lon out of the string and convert to doubles
|
||||
nsresult rv;
|
||||
nsString slat(Substring(str, 1, comma - 1));
|
||||
nsString slon(Substring(str, comma + 1));
|
||||
double lat = slat.ToDouble(&rv);
|
||||
NS_ENSURE_SUCCESS(rv,);
|
||||
double lon = slon.ToDouble(&rv);
|
||||
NS_ENSURE_SUCCESS(rv,);
|
||||
|
||||
// store the values
|
||||
mLatitude = lat;
|
||||
mLongitude = lon;
|
||||
|
||||
GPSLOG("changing coords for %s to %s (%f, %f)",
|
||||
(mOrigin.IsEmpty() ? "global" : NS_ConvertUTF16toUTF8(mOrigin).get()),
|
||||
NS_ConvertUTF16toUTF8(str).get(),
|
||||
mLatitude, mLongitude);
|
||||
}
|
||||
|
||||
@ -1,173 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef nsGeolocationSettings_h
|
||||
#define nsGeolocationSettings_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/StaticPtr.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsClassHashtable.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsJSUtils.h"
|
||||
#include "nsTArray.h"
|
||||
|
||||
#if (defined(MOZ_GPS_DEBUG) && defined(ANDROID))
|
||||
#include <android/log.h>
|
||||
#define GPSLOG(fmt, ...) __android_log_print(ANDROID_LOG_WARN, "GPS", "%12s:%-5d " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
|
||||
#else
|
||||
#define GPSLOG(...) {;}
|
||||
#endif // MOZ_GPS_DEBUG && ANDROID
|
||||
|
||||
// The settings key.
|
||||
#define GEO_ENABLED "geolocation.enabled"
|
||||
#define GEO_ALA_ENABLED "ala.settings.enabled"
|
||||
#define GEO_ALA_TYPE "geolocation.type"
|
||||
#define GEO_ALA_FIXED_COORDS "geolocation.fixed_coords"
|
||||
#define GEO_ALA_APP_SETTINGS "geolocation.app_settings"
|
||||
#define GEO_ALA_ALWAYS_PRECISE "geolocation.always_precise"
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
#define GEO_ALA_APPROX_DISTANCE "geolocation.approx_distance"
|
||||
#endif
|
||||
|
||||
enum GeolocationFuzzMethod {
|
||||
GEO_ALA_TYPE_PRECISE, // default, GPS/AGPS location
|
||||
GEO_ALA_TYPE_FIXED, // user supplied lat/long
|
||||
GEO_ALA_TYPE_NONE, // no location given
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
GEO_ALA_TYPE_APPROX // approximate, grid-based location
|
||||
#endif
|
||||
};
|
||||
|
||||
#define GEO_ALA_TYPE_DEFAULT (GEO_ALA_TYPE_PRECISE)
|
||||
#define GEO_ALA_TYPE_FIRST (GEO_ALA_TYPE_PRECISE)
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
#define GEO_ALA_TYPE_LAST (GEO_ALA_TYPE_APPROX)
|
||||
#else
|
||||
#define GEO_ALA_TYPE_LAST (GEO_ALA_TYPE_NONE)
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Simple class for holding the geolocation settings values.
|
||||
*/
|
||||
|
||||
class GeolocationSetting final {
|
||||
public:
|
||||
explicit GeolocationSetting(const nsString& aOrigin) :
|
||||
mFuzzMethod(GEO_ALA_TYPE_DEFAULT),
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance(0),
|
||||
#endif
|
||||
mLatitude(0.0),
|
||||
mLongitude(0.0),
|
||||
mOrigin(aOrigin) {}
|
||||
|
||||
GeolocationSetting(const GeolocationSetting& rhs) :
|
||||
mFuzzMethod(rhs.mFuzzMethod),
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance(rhs.mDistance),
|
||||
#endif
|
||||
mLatitude(rhs.mLatitude),
|
||||
mLongitude(rhs.mLongitude),
|
||||
mOrigin(rhs.mOrigin) {}
|
||||
|
||||
~GeolocationSetting() {}
|
||||
|
||||
GeolocationSetting& operator=(const GeolocationSetting& rhs) {
|
||||
mFuzzMethod = rhs.mFuzzMethod;
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance = rhs.mDistance;
|
||||
#endif
|
||||
mLatitude = rhs.mLatitude;
|
||||
mLongitude = rhs.mLongitude;
|
||||
mOrigin = rhs.mOrigin;
|
||||
return *this;
|
||||
}
|
||||
|
||||
void HandleTypeChange(const JS::Value& aVal);
|
||||
void HandleApproxDistanceChange(const JS::Value& aVal);
|
||||
void HandleFixedCoordsChange(const JS::Value& aVal);
|
||||
|
||||
inline GeolocationFuzzMethod GetType() const { return mFuzzMethod; }
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
inline int32_t GetApproxDistance() const { return mDistance; }
|
||||
#endif
|
||||
inline double GetFixedLatitude() const { return mLatitude; }
|
||||
inline double GetFixedLongitude() const { return mLongitude; }
|
||||
inline const nsString& GetOrigin() const { return mOrigin; }
|
||||
|
||||
private:
|
||||
GeolocationSetting() :
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
mDistance(0),
|
||||
#endif
|
||||
mLatitude(0),
|
||||
mLongitude(0)
|
||||
{} // can't default construct
|
||||
|
||||
GeolocationFuzzMethod mFuzzMethod;
|
||||
#ifdef MOZ_APPROX_LOCATION
|
||||
int32_t mDistance;
|
||||
#endif
|
||||
double mLatitude,
|
||||
mLongitude;
|
||||
nsString mOrigin;
|
||||
};
|
||||
|
||||
/**
|
||||
* Singleton that holds the global and per-origin geolocation settings.
|
||||
*/
|
||||
class nsGeolocationSettings final : public nsIObserver
|
||||
{
|
||||
public:
|
||||
static already_AddRefed<nsGeolocationSettings> GetGeolocationSettings();
|
||||
static mozilla::StaticRefPtr<nsGeolocationSettings> sSettings;
|
||||
|
||||
NS_DECL_THREADSAFE_ISUPPORTS
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
nsGeolocationSettings() : mAlaEnabled(false), mGlobalSetting(NullString()) {}
|
||||
nsresult Init();
|
||||
|
||||
void HandleGeolocationSettingsChange(const nsAString& aKey, const JS::Value& aVal);
|
||||
void HandleGeolocationSettingsError(const nsAString& aName);
|
||||
|
||||
void PutWatchOrigin(int32_t aWatchID, const nsCString& aOrigin);
|
||||
void RemoveWatchOrigin(int32_t aWatchID);
|
||||
void GetWatchOrigin(int32_t aWatchID, nsCString& aOrigin);
|
||||
inline bool IsAlaEnabled() const { return mAlaEnabled; }
|
||||
|
||||
// given a watch ID, retrieve the geolocation settings. the watch ID is
|
||||
// mapped to the origin of the listener/request which is then used to
|
||||
// retreive the geolocation settings for the origin.
|
||||
// if the origin is in the always-precise list, the settings will always be
|
||||
// 'precise'. if the origin has origin-specific settings, that will be returned
|
||||
// otherwise the global geolocation settings will be returned.
|
||||
// NOTE: this returns a copy of the settings to enforce read-only client access
|
||||
GeolocationSetting LookupGeolocationSetting(int32_t aWatchID);
|
||||
|
||||
private:
|
||||
~nsGeolocationSettings() {}
|
||||
nsGeolocationSettings(const nsGeolocationSettings&) :
|
||||
mGlobalSetting(NullString()) {} // can't copy obj
|
||||
|
||||
void HandleMozsettingsChanged(nsISupports* aSubject);
|
||||
void HandleGeolocationAlaEnabledChange(const JS::Value& aVal);
|
||||
void HandleGeolocationPerOriginSettingsChange(const JS::Value& aVal);
|
||||
void HandleGeolocationAlwaysPreciseChange(const JS::Value& aVal);
|
||||
|
||||
private:
|
||||
bool mAlaEnabled;
|
||||
GeolocationSetting mGlobalSetting;
|
||||
nsClassHashtable<nsStringHashKey, GeolocationSetting> mPerOriginSettings;
|
||||
nsTArray<nsString> mAlwaysPreciseApps;
|
||||
nsClassHashtable<nsUint32HashKey, nsCString> mCurrentWatches;
|
||||
};
|
||||
|
||||
#endif /* nsGeolocationSettings_h */
|
||||
|
||||
@ -118,7 +118,6 @@
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsDebugImpl.h"
|
||||
#include "nsFrameMessageManager.h"
|
||||
#include "nsGeolocationSettings.h"
|
||||
#include "nsHashPropertyBag.h"
|
||||
#include "nsIAlertsService.h"
|
||||
#include "nsIAppsService.h"
|
||||
@ -4570,19 +4569,6 @@ ContentParent::RecvAddGeolocationListener(const IPC::Principal& aPrincipal,
|
||||
// creation of a new listener.
|
||||
RecvRemoveGeolocationListener();
|
||||
mGeolocationWatchID = AddGeolocationListener(this, this, aHighAccuracy);
|
||||
|
||||
// let the the settings cache know the origin of the new listener
|
||||
nsAutoCString origin;
|
||||
// hint to the compiler to use the conversion operator to nsIPrincipal*
|
||||
nsCOMPtr<nsIPrincipal> principal = static_cast<nsIPrincipal*>(aPrincipal);
|
||||
if (!principal) {
|
||||
return true;
|
||||
}
|
||||
principal->GetOrigin(origin);
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
if (gs) {
|
||||
gs->PutWatchOrigin(mGeolocationWatchID, origin);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -4595,11 +4581,6 @@ ContentParent::RecvRemoveGeolocationListener()
|
||||
return true;
|
||||
}
|
||||
geo->ClearWatch(mGeolocationWatchID);
|
||||
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
if (gs) {
|
||||
gs->RemoveWatchOrigin(mGeolocationWatchID);
|
||||
}
|
||||
mGeolocationWatchID = -1;
|
||||
}
|
||||
return true;
|
||||
@ -4611,21 +4592,8 @@ ContentParent::RecvSetGeolocationHigherAccuracy(const bool& aEnable)
|
||||
// This should never be called without a listener already present,
|
||||
// so this check allows us to forgo securing privileges.
|
||||
if (mGeolocationWatchID != -1) {
|
||||
nsCString origin;
|
||||
RefPtr<nsGeolocationSettings> gs = nsGeolocationSettings::GetGeolocationSettings();
|
||||
// get the origin stored for the curent watch ID
|
||||
if (gs) {
|
||||
gs->GetWatchOrigin(mGeolocationWatchID, origin);
|
||||
}
|
||||
|
||||
// remove and recreate a new, high-accuracy listener
|
||||
RecvRemoveGeolocationListener();
|
||||
mGeolocationWatchID = AddGeolocationListener(this, this, aEnable);
|
||||
|
||||
// map the new watch ID to the origin
|
||||
if (gs) {
|
||||
gs->PutWatchOrigin(mGeolocationWatchID, origin);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -5278,31 +5278,6 @@ elif test -z "$_ENABLE_LOGREFCNT"; then
|
||||
AC_DEFINE(NO_BUILD_REFCNT_LOGGING)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl moz_aproximate_location
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(approximate_location,
|
||||
[ --enable-approximate-location Enable approximate location ],
|
||||
MOZ_APPROX_LOCATION=1,
|
||||
MOZ_APPROX_LOCATION= )
|
||||
if test -n "$MOZ_APPROX_LOCATION"; then
|
||||
AC_DEFINE(MOZ_APPROX_LOCATION)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl moz_gps_debug
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(gps_debug,
|
||||
[ --enable-gps-debug Enable gps specific debug messages ],
|
||||
MOZ_GPS_DEBUG=1,
|
||||
MOZ_GPS_DEBUG= )
|
||||
if test -n "$MOZ_GPS_DEBUG"; then
|
||||
AC_DEFINE(MOZ_GPS_DEBUG)
|
||||
fi
|
||||
if test -n "$MOZ_DEBUG"; then
|
||||
AC_DEFINE(MOZ_GPS_DEBUG)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl moz_dump_painting
|
||||
dnl ========================================================
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user