Merge mozilla-central to autoland. a=merge on a CLOSED TREE

This commit is contained in:
Razvan Maries
2018-12-20 00:01:42 +02:00
27 changed files with 286 additions and 180 deletions

View File

@@ -149,7 +149,6 @@
#include "nsCommandManager.h"
#include "nsPIDOMWindow.h"
#include "nsPILoadGroupInternal.h"
#include "nsPIWindowRoot.h"
#include "IHistory.h"
@@ -6682,11 +6681,6 @@ nsresult nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
if (NS_SUCCEEDED(rv) && !channelCreationTime.IsNull()) {
Telemetry::AccumulateTimeDelta(Telemetry::TOTAL_CONTENT_PAGE_LOAD_TIME,
channelCreationTime);
nsCOMPtr<nsPILoadGroupInternal> internalLoadGroup =
do_QueryInterface(mLoadGroup);
if (internalLoadGroup) {
internalLoadGroup->OnEndPageLoad(aChannel);
}
}
}