Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1510569 - Port onRefreshAttempted from WebProgressChild.jsm to C++ r=baku

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D25650

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Barret Rennie 2019-04-03 17:32:56 +00:00
parent 163ec0ba8b
commit 9bbc7930d4
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/ipc/TabChild.cpp
View File

@ -540,9 +540,9 @@ nsresult TabChild::Init(mozIDOMWindowProxy* aParent) {
nsCOMPtr<nsIDocShell> 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(

10
toolkit/modules/WebProgressChild.jsm
View File

@ -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"]);