From d2e8741f6ddb653cb7a227b5288862ca9b1abdac Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 26 Oct 2017 19:42:18 -0400
Subject: [PATCH] Bug 1410900 - Allow using shift-click on the Reload Frame
 context menuitem to skip the cache when reloading the frame. r=johannh

This patch uses the same logic as BrowserReloadOrDuplicate to determine if the cache should be skipped. I didn't extract out the logic to a separate function because I didn't want to add another function to the global namespace of browser.js.

MozReview-Commit-ID: 15kztsqMnAM

--HG--
extra : rebase_source : d5ad3ee62062d5971c95281368a102298e367e59
---
 browser/base/content/browser-context.inc | 2 +-
 browser/base/content/nsContextMenu.js    | 5 +++--
 browser/modules/ContextMenu.jsm          | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 0fb210184e01..cc61044b3ac2 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -332,7 +332,7 @@
           <menuitem id="context-reloadframe"
                     label="&reloadFrameCmd.label;"
                     accesskey="&reloadFrameCmd.accesskey;"
-                    oncommand="gContextMenu.reloadFrame();"/>
+                    oncommand="gContextMenu.reloadFrame(event);"/>
           <menuseparator/>
           <menuitem id="context-bookmarkframe"
                     label="&bookmarkThisFrameCmd.label;"
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index e3b69eb671c0..87bf2308d955 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -832,9 +832,10 @@ nsContextMenu.prototype = {
   },
 
   // Reload clicked-in frame.
-  reloadFrame() {
+  reloadFrame(aEvent) {
+    let forceReload = aEvent.shiftKey;
     this.browser.messageManager.sendAsyncMessage("ContextMenu:ReloadFrame",
-                                                 null, { target: this.target });
+                                                 null, { target: this.target, forceReload });
   },
 
   // Open clicked-in frame in its own window.
diff --git a/browser/modules/ContextMenu.jsm b/browser/modules/ContextMenu.jsm
index bfd6d1d3bf5e..021e66ebe57e 100644
--- a/browser/modules/ContextMenu.jsm
+++ b/browser/modules/ContextMenu.jsm
@@ -105,7 +105,8 @@ const messageListeners = {
   },
 
   "ContextMenu:ReloadFrame": function(aMessage) {
-    this.getTarget(aMessage).ownerDocument.location.reload();
+    let forceReload = aMessage.objects && aMessage.objects.forceReload;
+    this.getTarget(aMessage).ownerDocument.location.reload(forceReload);
   },
 
   "ContextMenu:ReloadImage": function(aMessage) {