From 2d002e42a8b6e711e3c9ca5b6dd3611e9d8426ab Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 15 Sep 2022 17:08:33 +0200
Subject: Adaptations for 104-based

Change-Id: Ieb44b5c98b3342adca38916d8b77c54e8ed8e1d7
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/core/permission_manager_qt.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'src/core/permission_manager_qt.h')

diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h
index 566e0839b..00165d258 100644
--- a/src/core/permission_manager_qt.h
+++ b/src/core/permission_manager_qt.h
@@ -13,8 +13,8 @@
 
 namespace QtWebEngineCore {
 
-class PermissionManagerQt : public content::PermissionControllerDelegate {
-
+class PermissionManagerQt : public content::PermissionControllerDelegate
+{
 public:
     PermissionManagerQt();
     ~PermissionManagerQt();
@@ -24,41 +24,43 @@ public:
 
     // content::PermissionManager implementation:
     void RequestPermission(
-        content::PermissionType permission,
+        blink::PermissionType permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
         bool user_gesture,
         base::OnceCallback<void(blink::mojom::PermissionStatus)> callback) override;
 
     blink::mojom::PermissionStatus GetPermissionStatus(
-        content::PermissionType permission,
+        blink::PermissionType permission,
         const GURL& requesting_origin,
         const GURL& embedding_origin) override;
 
-    blink::mojom::PermissionStatus GetPermissionStatusForFrame(
-        content::PermissionType permission,
-        content::RenderFrameHost *render_frame_host,
-        const GURL& requesting_origin) override;
-
-    blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(content::PermissionType, content::RenderFrameHost *) override;
+    blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(blink::PermissionType, content::RenderFrameHost *) override;
 
-    blink::mojom::PermissionStatus GetPermissionStatusForWorker(content::PermissionType, content::RenderProcessHost *, const GURL &) override;
+    blink::mojom::PermissionStatus GetPermissionStatusForWorker(blink::PermissionType, content::RenderProcessHost *, const GURL &) override;
 
     void ResetPermission(
-        content::PermissionType permission,
+        blink::PermissionType permission,
         const GURL& requesting_origin,
         const GURL& embedding_origin) override;
 
     void RequestPermissions(
-        const std::vector<content::PermissionType>& permission,
+        const std::vector<blink::PermissionType>& permission,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
         bool user_gesture,
         base::OnceCallback<void(
             const std::vector<blink::mojom::PermissionStatus>&)> callback) override;
 
+    void RequestPermissionsFromCurrentDocument(
+        const std::vector<blink::PermissionType>& permissions,
+        content::RenderFrameHost* render_frame_host,
+        bool user_gesture,
+        base::OnceCallback<void(
+            const std::vector<blink::mojom::PermissionStatus>&)> callback) override;
+
     content::PermissionControllerDelegate::SubscriptionId SubscribePermissionStatusChange(
-        content::PermissionType permission,
+        blink::PermissionType permission,
         content::RenderProcessHost* render_process_host,
         content::RenderFrameHost* render_frame_host,
         const GURL& requesting_origin,
@@ -76,7 +78,7 @@ private:
     };
     struct MultiRequest {
         int id;
-        std::vector<content::PermissionType> types;
+        std::vector<blink::PermissionType> types;
         QUrl origin;
         base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback;
     };
-- 
cgit v1.2.3