Follow-up of #8751

Auditors: @bbondy, @bsclifton

app/browser/reducers/autoplayReducer.js

@@ -15,7 +15,12 @@ const locale = require('../../locale')
 const messages = require('../../../js/constants/messages')
 const urlParse = require('../../common/urlParse')
 
-const showAutoplayMessageBox = (location, tabId) => {
+const showAutoplayMessageBox = (tabId) => {
+  const tab = webContents.fromTabID(tabId)
+  if (!tab || tab.isDestroyed()) {
+    return
+  }
+  const location = tab.getURL()
   const origin = getOrigin(location)
   const originSettings = siteSettings.getSiteSettingsForURL(AppStore.getState().get('siteSettings'), origin)
   if (originSettings && originSettings.get('noAutoplay') === true) {
@@ -46,11 +51,8 @@ const showAutoplayMessageBox = (location, tabId) => {
       if (buttonIndex === 0) {
         appActions.changeSiteSetting(ruleKey, 'noAutoplay', false)
 
-        if (tabId) {
-          const tab = webContents.fromTabID(tabId)
-          if (tab && !tab.isDestroyed()) {
-            return tab.reload()
-          }
+        if (tab && !tab.isDestroyed()) {
+          tab.reload()
         }
       } else {
         if (persist) {
@@ -65,7 +67,7 @@ const autoplayReducer = (state, action, immutableAction) => {
   action = immutableAction || makeImmutable(action)
   switch (action.get('actionType')) {
     case appConstants.APP_AUTOPLAY_BLOCKED:
-      showAutoplayMessageBox(action.get('location'), action.get('tabId'))
+      showAutoplayMessageBox(action.get('tabId'))
       break
   }
   return state

docs/appActions.md

@@ -1036,14 +1036,12 @@ because ESC was pressed.
 
 
 
-### autoplayBlocked(location, tabId) 
+### autoplayBlocked(tabId) 
 
 Notifies autoplay has been blocked
 
 **Parameters**
 
-**location**: `string`, Location of current frame
-
 **tabId**: `number`, Tab id of current frame
 
 

js/actions/appActions.js

@@ -1296,13 +1296,11 @@ const appActions = {
 
   /**
    * Notifies autoplay has been blocked
-   * @param {string} location - Location of current frame
    * @param {number} tabId - Tab id of current frame
    */
-  autoplayBlocked: function (location, tabId) {
+  autoplayBlocked: function (tabId) {
     AppDispatcher.dispatch({
       actionType: appConstants.APP_AUTOPLAY_BLOCKED,
-      location,
       tabId
     })
   }

js/components/frame.js

@@ -529,7 +529,7 @@ class Frame extends React.Component {
         windowActions.setBlockedBy(this.frame, 'noScript', e.details[1])
       }
       if (e.details[0] === 'autoplay') {
-        appActions.autoplayBlocked(this.frame.get('location'), this.frame.get('tabId'))
+        appActions.autoplayBlocked(this.frame.get('tabId'))
       }
     })
     this.webview.addEventListener('did-block-run-insecure-content', (e) => {

js/flash.js

@@ -80,7 +80,7 @@ module.exports.showFlashMessageBox = (location, tabId) => {
         if (tabId) {
           const tab = webContents.fromTabID(tabId)
           if (tab && !tab.isDestroyed()) {
-            return tab.reload()
+            tab.reload()
           }
         }
       } else {