From 5083e449b05d06dde46d5bf6656f5972b4f79fd6 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Thu, 25 Jul 2019 13:11:11 -0700
Subject: [PATCH] cr round 2

---
 .../resources/qml/+webengine/TabletBrowser.qml  |  4 ++++
 .../+webengine/FlickableWebViewCore.qml         |  5 +++++
 .../qml/controlsUit/+webengine/BaseWebView.qml  |  4 ++++
 .../qml/controlsUit/PermissionPopup.qml         | 17 +++--------------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/+webengine/TabletBrowser.qml b/interface/resources/qml/+webengine/TabletBrowser.qml
index 12cb85e8e3..49b87e51dd 100644
--- a/interface/resources/qml/+webengine/TabletBrowser.qml
+++ b/interface/resources/qml/+webengine/TabletBrowser.qml
@@ -87,6 +87,10 @@ Item {
         }
 
         onFeaturePermissionRequested: {
+            if (permissionPopupBackground.visible === true) {
+                console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
+                return;
+            }
             permissionPopupBackground.securityOrigin = securityOrigin;
             permissionPopupBackground.feature = feature;
 
diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
index f8343db807..a36b6791a4 100644
--- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
@@ -146,6 +146,11 @@ Item {
         }
 
         onFeaturePermissionRequested: {
+            if (permissionPopupBackground.visible === true) {
+                console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
+                return;
+            }
+
             permissionPopupBackground.securityOrigin = securityOrigin;
             permissionPopupBackground.feature = feature;
 
diff --git a/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml b/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
index 70480906d5..3a8dc917a6 100644
--- a/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
+++ b/interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
@@ -41,6 +41,10 @@ WebEngineView {
     WebSpinner { }
 
     onFeaturePermissionRequested: {
+        if (permissionPopupBackground.visible === true) {
+            console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
+            return;
+        }
         permissionPopupBackground.securityOrigin = securityOrigin;
         permissionPopupBackground.feature = feature;
 
diff --git a/interface/resources/qml/controlsUit/PermissionPopup.qml b/interface/resources/qml/controlsUit/PermissionPopup.qml
index 9940232eb1..58c0de9b43 100644
--- a/interface/resources/qml/controlsUit/PermissionPopup.qml
+++ b/interface/resources/qml/controlsUit/PermissionPopup.qml
@@ -26,13 +26,10 @@ Rectangle {
     ColumnLayout {
         anchors.fill: parent
         Rectangle {
-            id: webAccessHeaderContainer
             height: 75
-            anchors.top: parent.top
             Layout.preferredWidth: parent.width
 
             HifiStyles.RalewayBold {
-                id: webAccessHeaderText
                 text: "REQUEST FOR DEVICE ACCESS"
 
                 anchors.horizontalCenter: parent.horizontalCenter
@@ -44,12 +41,10 @@ Rectangle {
         }
 
         Rectangle {
-            id: webAccessInfoContainer
             height: 35
             Layout.preferredWidth: parent.width
 
             HifiStyles.RalewayLight {
-                id: webAccessInfoText
                 text: "This website is attempting to " + root.permissionLanguage[root.currentRequestedPermission] + "."
 
                 anchors.centerIn: parent
@@ -60,39 +55,33 @@ Rectangle {
         }
         
         Rectangle {
-            id: permissionsButtonsRow
             height: 100
             Layout.preferredWidth: parent.width
             Layout.topMargin: 35
             property int space: 8
-            readonly property int _LEFT_BUTTON: 0
-            readonly property int _RIGHT_BUTTON: 1
 
             HifiControls.Button {
-                id: leftButton
                 text: "Don't Allow"
 
                 anchors.right: parent.horizontalCenter
                 anchors.rightMargin: parent.space
+                width: 125
                 color: hifi.buttons.red
-                enabled: true
                 height: 38
                 onClicked: {
-                    root.permissionButtonPressed(parent._LEFT_BUTTON);
+                    root.permissionButtonPressed(0);
                 }
             }
             HifiControls.Button {
-                id: rightButton
                 text: "Yes allow access"
 
                 anchors.left: parent.horizontalCenter
                 anchors.leftMargin: parent.space
                 color: hifi.buttons.blue
-                enabled: true
                 width: 155
                 height: 38
                 onClicked: {
-                    root.permissionButtonPressed(parent._RIGHT_BUTTON);
+                    root.permissionButtonPressed(1);
                 }
             }
         }