From 451498e95b2079091baf2a582b7a16e6379d0c26 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 9 Feb 2016 17:46:23 +0000
Subject: [PATCH] Bug 1197461 - Implement Permissions.revoke. r=poiru,baku

---
 dom/permission/Permissions.cpp | 53 ++++++++++++++++++++++++++++++++++
 dom/permission/Permissions.h   |  4 +++
 dom/webidl/Permissions.webidl  |  2 ++
 3 files changed, 59 insertions(+)

diff --git a/dom/permission/Permissions.cpp b/dom/permission/Permissions.cpp
index 18b7503f336..546f01fc78a 100644
--- a/dom/permission/Permissions.cpp
+++ b/dom/permission/Permissions.cpp
@@ -121,5 +121,58 @@ Permissions::Query(JSContext* aCx,
   return promise.forget();
 }
 
+already_AddRefed<Promise>
+Permissions::Revoke(JSContext* aCx,
+                    JS::Handle<JSObject*> aPermission,
+                    ErrorResult& aRv)
+{
+  nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(mWindow);
+  if (!global) {
+    aRv.Throw(NS_ERROR_UNEXPECTED);
+    return nullptr;
+  }
+
+  RefPtr<Promise> promise = Promise::Create(global, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  PermissionDescriptor permission;
+  JS::Rooted<JS::Value> value(aCx, JS::ObjectOrNullValue(aPermission));
+  if (NS_WARN_IF(!permission.Init(aCx, value))) {
+    promise->MaybeReject(NS_ERROR_UNEXPECTED);
+    return promise.forget();
+  }
+
+  nsCOMPtr<nsIDocument> document = mWindow->GetExtantDoc();
+  if (!document) {
+    promise->MaybeReject(NS_ERROR_UNEXPECTED);
+    return promise.forget();
+  }
+
+  nsCOMPtr<nsIPermissionManager> permMgr = services::GetPermissionManager();
+  if (NS_WARN_IF(!permMgr)) {
+    promise->MaybeReject(NS_ERROR_FAILURE);
+    return promise.forget();
+  }
+
+  nsresult rv = permMgr->RemoveFromPrincipal(document->NodePrincipal(), PermissionNameToType(permission.mName));
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    promise->MaybeReject(rv);
+    return promise.forget();
+  }
+
+  RefPtr<PermissionStatus> status =
+    CreatePermissionStatus(aCx, aPermission, mWindow, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    MOZ_ASSERT(!status);
+    promise->MaybeReject(aRv);
+  } else {
+    MOZ_ASSERT(status);
+    promise->MaybeResolve(status);
+  }
+  return promise.forget();
+}
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/permission/Permissions.h b/dom/permission/Permissions.h
index d643599b4c4..521b9cbf468 100644
--- a/dom/permission/Permissions.h
+++ b/dom/permission/Permissions.h
@@ -38,6 +38,10 @@ public:
                                   JS::Handle<JSObject*> aPermission,
                                   ErrorResult& aRv);
 
+  already_AddRefed<Promise> Revoke(JSContext* aCx,
+                                   JS::Handle<JSObject*> aPermission,
+                                   ErrorResult& aRv);
+
 private:
   ~Permissions();
 
diff --git a/dom/webidl/Permissions.webidl b/dom/webidl/Permissions.webidl
index 17574c75e59..29b3fa1922b 100644
--- a/dom/webidl/Permissions.webidl
+++ b/dom/webidl/Permissions.webidl
@@ -26,4 +26,6 @@ dictionary PushPermissionDescriptor : PermissionDescriptor {
 interface Permissions {
   [Throws]
   Promise<PermissionStatus> query(object permission);
+  [Throws]
+  Promise<PermissionStatus> revoke(object permission);
 };