Bug 1515194 - part 2 - remove nsPILoadGroupInternal; r=valentin

We apparently had this for internal extension hooks that couldn't be
depended on externally...but now that interfaces aren't exposed to
addons, we can remove this no-op interface entirely.
This commit is contained in:
Nathan Froyd 2018-12-19 10:08:28 -05:00
Родитель d7b6a23e76
Коммит 6e924db228
5 изменённых файлов: 1 добавлений и 52 удалений

Просмотреть файл

@ -149,7 +149,6 @@
#include "nsCommandManager.h"
#include "nsPIDOMWindow.h"
#include "nsPILoadGroupInternal.h"
#include "nsPIWindowRoot.h"
#include "IHistory.h"
@ -6693,11 +6692,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);
}
}
}

Просмотреть файл

@ -127,7 +127,6 @@ XPIDL_SOURCES += [
'nsIURIWithSpecialOrigin.idl',
'nsIURL.idl',
'nsIURLParser.idl',
'nsPILoadGroupInternal.idl',
'nsPISocketTransportService.idl',
]

Просмотреть файл

@ -117,7 +117,6 @@ nsLoadGroup::~nsLoadGroup() {
NS_IMPL_AGGREGATED(nsLoadGroup)
NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsLoadGroup)
NS_INTERFACE_MAP_ENTRY(nsILoadGroup)
NS_INTERFACE_MAP_ENTRY(nsPILoadGroupInternal)
NS_INTERFACE_MAP_ENTRY(nsILoadGroupChild)
NS_INTERFACE_MAP_ENTRY(nsIRequest)
NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
@ -692,18 +691,6 @@ nsLoadGroup::GetRootLoadGroup(nsILoadGroup **aRootLoadGroup) {
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
// nsPILoadGroupInternal methods:
NS_IMETHODIMP
nsLoadGroup::OnEndPageLoad(nsIChannel *aDefaultChannel) {
LOG(("nsLoadGroup::OnEndPageLoad this=%p default-request=%p", this,
aDefaultChannel));
// for the moment, nothing to do here.
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
// nsISupportsPriority methods:

Просмотреть файл

@ -8,7 +8,6 @@
#include "nsILoadGroup.h"
#include "nsILoadGroupChild.h"
#include "nsPILoadGroupInternal.h"
#include "nsAgg.h"
#include "nsCOMPtr.h"
#include "nsWeakReference.h"
@ -26,8 +25,7 @@ namespace net {
class nsLoadGroup : public nsILoadGroup,
public nsILoadGroupChild,
public nsISupportsPriority,
public nsSupportsWeakReference,
public nsPILoadGroupInternal {
public nsSupportsWeakReference {
public:
NS_DECL_AGGREGATED
@ -38,7 +36,6 @@ class nsLoadGroup : public nsILoadGroup,
////////////////////////////////////////////////////////////////////////////
// nsILoadGroup methods:
NS_DECL_NSILOADGROUP
NS_DECL_NSPILOADGROUPINTERNAL
////////////////////////////////////////////////////////////////////////////
// nsILoadGroupChild methods:

Просмотреть файл

@ -1,28 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsISupports.idl"
interface nsIChannel;
/**
* Dumping ground for load group experimental work.
* This interface will never be frozen. If you are
* using any feature exposed by this interface, be aware that this interface
* will change and you will be broken. You have been warned.
*/
[scriptable, uuid(6ef2f8ac-9584-48f3-957a-0c94fff0c8c7)]
interface nsPILoadGroupInternal : nsISupports
{
/**
* Called when the load group has loaded main page and
* subresources. (i.e.essentially DOMComplete)
*
* @param aDefaultChanel
* The request channel for the base apge
*/
void OnEndPageLoad(in nsIChannel aDefaultChannel);
};