diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index c69f855d28e1..cc196d070df0 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -540,9 +540,9 @@ nsresult TabChild::Init(mozIDOMWindowProxy* aParent) { nsCOMPtr docShell = do_GetInterface(WebNavigation()); MOZ_ASSERT(docShell); - const uint32_t notifyMask = nsIWebProgress::NOTIFY_PROGRESS | - nsIWebProgress::NOTIFY_STATUS | - nsIWebProgress::NOTIFY_CONTENT_BLOCKING; + const uint32_t notifyMask = + nsIWebProgress::NOTIFY_PROGRESS | nsIWebProgress::NOTIFY_STATUS | + nsIWebProgress::NOTIFY_REFRESH | nsIWebProgress::NOTIFY_CONTENT_BLOCKING; mStatusFilter = new nsBrowserStatusFilter(); @@ -3373,7 +3373,10 @@ NS_IMETHODIMP TabChild::OnProgressChange64(nsIWebProgress* aWebProgress, NS_IMETHODIMP TabChild::OnRefreshAttempted(nsIWebProgress* aWebProgress, nsIURI* aRefreshURI, int32_t aMillis, bool aSameURI, bool* aOut) { - return NS_ERROR_NOT_IMPLEMENTED; + NS_ENSURE_ARG_POINTER(aOut); + *aOut = true; + + return NS_OK; } nsresult TabChild::PrepareProgressListenerData( diff --git a/toolkit/modules/WebProgressChild.jsm b/toolkit/modules/WebProgressChild.jsm index a2b8904161d6..2d856f546097 100644 --- a/toolkit/modules/WebProgressChild.jsm +++ b/toolkit/modules/WebProgressChild.jsm @@ -27,11 +27,12 @@ class WebProgressChild { this.inLoadURI = false; - // NOTIFY_PROGRESS, NOTIFY_STATUS, and NOTIFY_CONTENT_BLOCKING are handled - // by PBrowser. + // NOTIFY_PROGRESS, NOTIFY_STATUS, NOTIFY_REFRESH, and + // NOTIFY_CONTENT_BLOCKING are handled by PBrowser. let notifyCode = Ci.nsIWebProgress.NOTIFY_ALL & ~Ci.nsIWebProgress.NOTIFY_PROGRESS & ~Ci.nsIWebProgress.NOTIFY_STATUS & + ~Ci.nsIWebProgress.NOTIFY_REFRESH & ~Ci.nsIWebProgress.NOTIFY_CONTENT_BLOCKING; this._filter = Cc["@mozilla.org/appshell/component/browser-status-filter;1"] @@ -180,10 +181,6 @@ class WebProgressChild { this._send("Content:SecurityChange", json); } - onRefreshAttempted(aWebProgress, aURI, aDelay, aSameURI) { - return true; - } - sendLoadCallResult() { this.mm.sendAsyncMessage("Content:LoadURIResult"); } @@ -191,5 +188,4 @@ class WebProgressChild { WebProgressChild.prototype.QueryInterface = ChromeUtils.generateQI(["nsIWebProgressListener", - "nsIWebProgressListener2", "nsISupportsWeakReference"]);