mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
86a3aa0b54
- missing part of Bug 1165772: P1. (7311039be4) - missing gstreamer stuff (54a80d69b2) - Bug 1214208: Do not use MP3Decoder on B2G. r=alfredo (0a19e7946e) - Bug 1194014 - Remove redundant includes. r=jya (ccc3753113) - Bug 1039639 - Add support for Flac on Firefox OS. r=cajbir (7d76197e07) - Bug 875573 - Add video/x-m4v mime type. r=kentuckyfriedtakahe (6ec8af93e6) - cleanup (6fb3d5dd26) - Bug 1180621 - [FxOS] Enable VP9 codec for the Android version after KK. r=sotaro (58f7c2b657) - Bug 1187247: [MSE] P2. Enable WebM in MediaSource. r=jya (2df0ee1f7a) - Bug 1187247: [MSE] P1. Continue parsing MediaSegment if buffer starts with SimpleBlock/Block. r=kinetik (574475ed6f) - Bug 1217170: P1. Rename functions to explicitly reflect what they are doing. r=kentuckyfriedtakahe (70c81a8179) - Bug 1070216 - Split DOMMediaStream::InitStreamCommon into three. r=roc (1bda71cc88) - Bug 1215582 - Rename Blacklist to Block list in GStreamerFormatReader. r=gerald (4f08077f5e) - Bug 1170958 - Destroy track-locked MediaInputPorts when the track ends. r=roc (ff3922a2d6) - Bug 1070216 - constify DOMMediaStream::Get[Audio/Video]Tracks(). r=roc (ba09f6f191) - Bug 1070216 - Guard against adding a track owned by one MSG to a stream owned by another. r=padenot (a80deb8b30) - Bug 1070216 - Implement MediaStream constructors. r=smaug,jib,padenot (3403ef2599) - Bug 1070216 - Guard against a null MediaInputPort in DOMMediaStream::FindPlaybackDOMTrack(). r=roc (453a9ffbc1) - Bug 1212783 - Expose TrackPort in DOMMediaStream.h r=roc (fb61c79ae7) - Bug 1219711 - Ensure MediaStreamTrack.enabled propagates across peer connections. r=jesup (d9d1e54dae) - Bug 1129051 - Fix double free in Camera Control Listener. Fix webrtc memory leak. r=aosmond (3e9b3bccfd) - Bug 1152260 - Generate focused event for drivers that do not notify us when using continuous auto focus. r=mikeh (6c7bd42fdc) - Bug 1175656 - Implement generation of recording posters in Gecko. r=dhylands,bz (51b2c66dc7) - Bug 1187364 - Part 1. Add ability for camera to pause/resume recording. r=dhylands,bz (c54c735e37) - Bug 1187364 - Part 2. Ensure that recording is resumed with a key frame. r=mchiang (c1c6048982) - Bug 1187364 - Part 3. Fix missing end comment in WebIDL. r=me,bz (7faf106cc1) - Bug 1212783 - Add a MediaStreamTrack to DOMCameraControl. r=aosmond (91e11efd3a) - Bug 1124338 - Fix possible camera cached parameters invalidation from underlying driver modification. r=aosmond (dea67dc155) - Bug 1196330 - Do not restart preview if configuration is unchanged. r=dhylands (097644f5d9) - Bug 1215372 - Filter empty camera face detected events at gonk layer. r=dhylands (733efe50eb) - Bug 1179726 - Prefer lower resolutions than 4kuhd as the default video recording profile. r=dhylands (27c71273dc) - Bug 1222122 - Add picture size to verified parameters when reconfiguring the camera. r=dhylands (8c1fac6a4a) - Bug 1141267 - register CameraThread with profiler, r=aosmond (299592a024) - Bug 1008483 - removes the RW lock in CameraControlImpl and replaces it with a standard mutex. r=aosmond (45936cb90d) - Bug 1008483 - Part 2. Readd missing nsPrintfCString.h include which has broken some local builds. r=me (9dd84b0f19) - Bug 1191731 - Update poster API to allow application control over when poster is saved. r=bz, r=dhylands (73f9e7e0f4) - Bug 1155648 - Fix documentation for DOMMediaStream::OnTracksAvailable. r=jesup (702828c304) - Bug 1217170: [MSE] P2. Enable WebM/MSE on systems with no MP4/H264 support. r=kentuckyfriedtakahe (0b814b0708) - Bug 1213177: Enable WebM on machines where H264 HW decoding is disabled. r=kentuckyfriedtakahe (e64da2ea24) - add back some sps telemetry (52c2c64f5b) - missing bit of Bug 1195073: [MSE/webm] P1 (9c45e82c3d) - Bug 1150305 - sourcebuffer.buffered returns the same object if not changed. r=roc, r=bz, r=jya (6005d56c0c) - Bug 1215447 - move flag setting from SeekStarted() to Seek(). r=roc. (a646b744c1) - Bug 1119936 - Audio from FM Radio or Music app ceases to play when switching between front/back camera. r=roc (1a60aa7d69) - Bug 1186806 - Part 1: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLFormControlsCollection. r=khuey (ccb8cb180a) - Bug 1186806 - Part 2: Use NS_IMPL_CYCLE_COLLECTION_TRAVERSE instead of manual traversal in HTMLFormElement. r=khuey (57e6eabf1b) - Bug 1186806 - Part 3: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLMediaElement. r=khuey (243ef6e83b) - Bug 1186806 - Part 4: Replace nsBaseHashtable::EnumerateRead() with iterators in HTMLPropertiesCollection. r=khuey (499bdef85f) - Bug 1163958 - Reduce the allocation in MediaStreamGraph - patch 3 CLOSED TREE (a557661df1) - Bug 1219330 - Prevent the creation of TextureClient after shutdown. r=mattwoodrow (a6c047d54f) - Bug 1205559: Make TextureChild/TextureClient thread-safe. r=nical (307c089631) - missing bit of 1219330 (0e351ea419) - nsRefPtr -> RefPtr (07ba248e69) - Bug 1215023. Part 1 - make MediaDecoder::mOwner a const member. We will check mShuttingDown before calling functions of mOwner. r=kinetik. (da7f201815) - Bug 1215023. Part 2 - remove null check of mOwner. We check mShuttingDown to know whether it is valid to call functions of mOwner. r=kinetik. (8d28a04bbe) - Bug 1220558. Part 2 - remove unused members. r=jya. (d3a9ed8c68) - Bug 1223599 - Remove the throttling argument from AbstractMediaDecoder::NotifyDataArrived(). r=jya. (320323ff1d) - Bug 1194606 - Make MediaDecoderStateMachine capable of requesting different kind (decoded/raw) of media data. r=jya (1e2b6a5c44) - Bug 1197075: P3. Decode frames ahead of MDSM requesting them. r=edwin This makes the media.*-decode-ahead pref performs more according to its name. We decode audio and video in advance so a MediaDataPromise can be resolved almost instantly. Default is 2. (b3f56447c4) - Bug 1189964 - Fix bustage. r=bustage CLOSED TREE (afaa49b4b5) - Bug 1212149 - e10s support for opening notification settings. r=wchen (f0e7778fb6) - Bug 1215644 - Use child process volume service cache for available and storage status requests. r=dhylands (dfd49f2ef3) - bug 1215552 - nsHttpConnectionMgr::PostEvent shouldnt manually ref count r=hurley (5e2f1886e6) - Bug 1219392 - Capitalize mozilla::unused to avoid conflicts. r=froydnj (0c8bb7f15a) - bug 1217834 - buzzfeed packet loss r=dragana (e9a60b605f) - Bug 1168033 - Add a comment to nsHttpConnectionMgr.cpp explaining the assignment of attemptedOptimisticPipeline. r=mcmanus (2451996350) - bug 1189645 - remove spdy telem r=hurley (cda90abbdb) - Bug 1148268 - fixed misspelling attribute mActorDestoryed. r=dhyland. (3615d68765) - Bug 1216031 - Make MediaDecoder::mVideoFrameContainer const. r=kinetik. (a3feb9d6bc) - missing bits of Bug 1165515 - Part 13-2 (009e32281f) - Bug 1131473 - crash in -[NativeMenuItemTarget menuItemHit:]. r=spohl (ea2da6441c) - Bug 1216416 - Fix -Wimplicit-fallthrough warnings in widget/cocoa. r=spohl (faaa390b20) - Bug 1181977 - Firefox app menu contains only "Quit" in certain edgecases. r=spohl (0b9d912961)
467 lines
13 KiB
C++
467 lines
13 KiB
C++
/* -*- 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");
|
|
aes.TakeOwnershipOfErrorReporting();
|
|
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)) {
|
|
continue;
|
|
}
|
|
if (mAlwaysPreciseApps.Contains(origin)) {
|
|
continue;
|
|
}
|
|
|
|
// get the app setting object
|
|
JS::RootedValue propertyValue(cx);
|
|
if (!JS_GetPropertyById(cx, obj, id, &propertyValue) || !propertyValue.isObject()) {
|
|
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);
|
|
}
|
|
|
|
#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);
|
|
}
|
|
#endif
|
|
|
|
// get and parse the coords, if any
|
|
JS::RootedValue coords(cx);
|
|
if (JS_GetProperty(cx, settingObj, "coords", &coords)) {
|
|
settings->HandleFixedCoordsChange(coords);
|
|
}
|
|
|
|
// 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");
|
|
aes.TakeOwnershipOfErrorReporting();
|
|
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()) {
|
|
continue;
|
|
}
|
|
|
|
nsAutoJSString origin;
|
|
if (!origin.init(cx, value)) {
|
|
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);
|
|
}
|
|
|