Bug 1724206 - Use WebExtensionPolicy webidl definition for addonPolic…

…y property on nsIPrincipal. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D121889
dothq · Aug 5, 2021 · a0128c7 · a0128c7
1 parent 342a867
commit a0128c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp
@@ -1070,7 +1070,8 @@ BasePrincipal::GetIsInIsolatedMozBrowserElement(
   return NS_OK;
 }
 
-nsresult BasePrincipal::GetAddonPolicy(nsISupports** aResult) {
+nsresult BasePrincipal::GetAddonPolicy(
+    extensions::WebExtensionPolicy** aResult) {
   RefPtr<extensions::WebExtensionPolicy> policy(AddonPolicy());
   policy.forget(aResult);
   return NS_OK;

diff --git a/caps/BasePrincipal.h b/caps/BasePrincipal.h
@@ -125,7 +125,7 @@ class BasePrincipal : public nsJSPrincipals {
   NS_IMETHOD CheckMayLoadWithReporting(nsIURI* uri,
                                        bool allowIfInheritsPrincipal,
                                        uint64_t innerWindowID) final;
-  NS_IMETHOD GetAddonPolicy(nsISupports** aResult) final;
+  NS_IMETHOD GetAddonPolicy(extensions::WebExtensionPolicy** aResult) final;
   NS_IMETHOD GetIsNullPrincipal(bool* aResult) override;
   NS_IMETHOD GetIsContentPrincipal(bool* aResult) override;
   NS_IMETHOD GetIsExpandedPrincipal(bool* aResult) override;

diff --git a/caps/nsIPrincipal.idl b/caps/nsIPrincipal.idl
@@ -44,6 +44,8 @@ class OriginAttributes;
 
 interface nsIURI;
 
+webidl WebExtensionPolicy;
+
 [ptr] native JSContext(JSContext);
 [ptr] native JSPrincipals(JSPrincipals);
 [ref] native PrincipalArray(const nsTArray<nsCOMPtr<nsIPrincipal>>);
@@ -432,7 +434,7 @@ interface nsIPrincipal : nsISupports
      */
     readonly attribute AString addonId;
 
-    readonly attribute nsISupports addonPolicy;
+    readonly attribute WebExtensionPolicy addonPolicy;
 
     /**
      * Gets the id of the user context this principal is inside.  If this