Backed out changeset 209adca8625c (bug 1606839) for multiple failures on browser_permissions_handling_user_input.js

CLOSED TREE

dom/base/nsContentPermissionHelper.cpp

@@ -17,6 +17,7 @@
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/PContentPermissionRequestParent.h"
 #include "mozilla/dom/ScriptSettings.h"
+#include "mozilla/dom/UserActivation.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Unused.h"
@@ -539,7 +540,7 @@ ContentPermissionRequestBase::ContentPermissionRequestBase(
       mRequester(aWindow ? new nsContentPermissionRequester(aWindow) : nullptr),
       mPrefName(aPrefName),
       mType(aType),
-      mIsHandlingUserInput(false),
+      mIsHandlingUserInput(UserActivation::IsHandlingUserInput()),
       mMaybeUnsafePermissionDelegate(false) {
   if (!aWindow) {
     return;
@@ -550,8 +551,6 @@ ContentPermissionRequestBase::ContentPermissionRequestBase(
     return;
   }
 
-  mIsHandlingUserInput = doc->HasValidTransientUserGestureActivation();
-
   mPermissionHandler = doc->GetPermissionDelegateHandler();
   if (mPermissionHandler) {
     nsTArray<nsCString> types;

dom/push/Push.jsm

@@ -70,8 +70,7 @@ Push.prototype = {
   askPermission() {
     console.debug("askPermission()");
 
-    let isHandlingUserInput = this._window.document
-      .hasValidTransientUserGestureActivation;
+    let isHandlingUserInput = this._window.windowUtils.isHandlingUserInput;
 
     return this.createPromise((resolve, reject) => {
       let permissionDenied = () => {