diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-01 15:42:46 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-11 10:15:13 +0200 |
commit | 687671d249613bb2b00570f93df35fcaa0eacdd3 (patch) | |
tree | 3e103acb3c30a8edbbec856cdc6063349db4548d /src/core/permission_manager_qt.h | |
parent | a3b6dfc0989227b3519daae817ec4fc420cd7016 (diff) |
Adaptations for Chromium 76
Change-Id: Id6d18a3854b572334dc1d65f1916b8991a740cd2
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/permission_manager_qt.h')
-rw-r--r-- | src/core/permission_manager_qt.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/core/permission_manager_qt.h b/src/core/permission_manager_qt.h index 89eb6cf85..6ab071237 100644 --- a/src/core/permission_manager_qt.h +++ b/src/core/permission_manager_qt.h @@ -45,7 +45,7 @@ #include "profile_adapter.h" -#include <QHash> +#include <map> namespace QtWebEngineCore { @@ -65,7 +65,7 @@ public: content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, bool user_gesture, - const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override; + base::OnceCallback<void(blink::mojom::PermissionStatus)> callback) override; blink::mojom::PermissionStatus GetPermissionStatus( content::PermissionType permission, @@ -87,32 +87,39 @@ public: content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, bool user_gesture, - const base::Callback<void( - const std::vector<blink::mojom::PermissionStatus>&)>& callback) override; + base::OnceCallback<void( + const std::vector<blink::mojom::PermissionStatus>&)> callback) override; int SubscribePermissionStatusChange( content::PermissionType permission, content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - const base::Callback<void(blink::mojom::PermissionStatus)>& callback) override; + const base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback) override; void UnsubscribePermissionStatusChange(int subscription_id) override; private: QHash<QPair<QUrl, PermissionType>, bool> m_permissions; - struct RequestOrSubscription { + struct Request { + int id; PermissionType type; QUrl origin; - base::Callback<void(blink::mojom::PermissionStatus)> callback; + base::OnceCallback<void(blink::mojom::PermissionStatus)> callback; }; struct MultiRequest { + int id; std::vector<content::PermissionType> types; QUrl origin; - base::Callback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback; + base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)> callback; }; - QHash<int, RequestOrSubscription> m_requests; - QHash<int, RequestOrSubscription> m_subscribers; - QHash<int, MultiRequest> m_multiRequests; + struct Subscription { + PermissionType type; + QUrl origin; + base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback; + }; + std::vector<Request> m_requests; + std::vector<MultiRequest> m_multiRequests; + std::map<int, Subscription> m_subscribers; int m_requestIdCount; int m_subscriberIdCount; |