Bug 813758 - Ensure permission for geolocation is tested in the parent process. r=bent

This commit is contained in:
Doug Turner 2012-12-01 21:21:56 -05:00
parent e74ae7978e
commit 8dc5deda97

View File

@ -1833,6 +1833,9 @@ ContentParent::RecvAsyncMessage(const nsString& aMsg,
bool
ContentParent::RecvAddGeolocationListener()
{
if (!AssertAppProcessPermission(this, "geolocation")) {
return false;
}
if (mGeolocationWatchID == -1) {
nsCOMPtr<nsIDOMGeoGeolocation> geo = do_GetService("@mozilla.org/geolocation;1");
if (!geo) {
@ -1847,20 +1850,28 @@ ContentParent::RecvAddGeolocationListener()
bool
ContentParent::RecvRemoveGeolocationListener()
{
if (mGeolocationWatchID != -1) {
nsCOMPtr<nsIDOMGeoGeolocation> geo = do_GetService("@mozilla.org/geolocation;1");
if (!geo) {
return true;
}
geo->ClearWatch(mGeolocationWatchID);
mGeolocationWatchID = -1;
if (mGeolocationWatchID == -1) {
return true;
}
if (!AssertAppProcessPermission(this, "geolocation")) {
return false;
}
nsCOMPtr<nsIDOMGeoGeolocation> geo = do_GetService("@mozilla.org/geolocation;1");
if (!geo) {
return true;
}
geo->ClearWatch(mGeolocationWatchID);
mGeolocationWatchID = -1;
return true;
}
NS_IMETHODIMP
ContentParent::HandleEvent(nsIDOMGeoPosition* postion)
{
if (!AssertAppProcessPermission(this, "geolocation")) {
return NS_ERROR_FAILURE;
}
unused << SendGeolocationUpdate(GeoPosition(postion));
return NS_OK;
}