Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

1 files changed, 6 insertions, 0 deletions

diff --git a/src/core/permission_manager_qt.cpp b/src/core/permission_manager_qt.cpp
index 1562a02c2..fd57ad7b8 100644
--- a/src/core/permission_manager_qt.cpp
+++ b/src/core/permission_manager_qt.cpp
@@ -99,6 +99,12 @@ void PermissionManagerQt::permissionRequestReply(const QUrl &origin, BrowserCont
     }
 }
 
+bool PermissionManagerQt::checkPermission(const QUrl &origin, BrowserContextAdapter::PermissionType type)
+{
+    QPair<QUrl, BrowserContextAdapter::PermissionType> key(origin, type);
+    return m_permissions.contains(key) && m_permissions[key];
+}
+
 int PermissionManagerQt::RequestPermission(content::PermissionType permission,
                                             content::RenderFrameHost *frameHost,
                                             const GURL& requesting_origin,