Bug 1515194 - part 2 - remove nsPILoadGroupInternal; r=valentin
authorNathan Froyd <froydnj@mozilla.com>
Wed, 19 Dec 2018 10:08:28 -0500
changeset 451370 7caeaeed08f05bd3ee6ae8a8af2b9c3d19679d39
parent 451369 83a64c5eb4fc54bc21875b97a1b13a5cb68efecf
child 451371 2c961fec66d8b22913848fd3af303c852d05267e
push id35235
push userrmaries@mozilla.com
push dateWed, 19 Dec 2018 21:59:17 +0000
treeherdermozilla-central@951340085daf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1515194
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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.
docshell/base/nsDocShell.cpp
netwerk/base/moz.build
netwerk/base/nsLoadGroup.cpp
netwerk/base/nsLoadGroup.h
netwerk/base/nsPILoadGroupInternal.idl
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -144,17 +144,16 @@
 #include "nsIWebProgress.h"
 #include "nsIWidget.h"
 #include "nsIWindowWatcher.h"
 #include "nsIWritablePropertyBag2.h"
 #include "nsIWyciwygChannel.h"
 
 #include "nsCommandManager.h"
 #include "nsPIDOMWindow.h"
-#include "nsPILoadGroupInternal.h"
 #include "nsPIWindowRoot.h"
 
 #include "IHistory.h"
 #include "IUrlClassifierUITelemetry.h"
 
 #include "mozIThirdPartyUtil.h"
 
 #include "nsArray.h"
@@ -6688,21 +6687,16 @@ nsresult nsDocShell::EndPageLoad(nsIWebP
 
   nsCOMPtr<nsITimedChannel> timingChannel = do_QueryInterface(aChannel);
   if (timingChannel) {
     TimeStamp channelCreationTime;
     rv = timingChannel->GetChannelCreation(&channelCreationTime);
     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);
-      }
     }
   }
 
   // Timing is picked up by the window, we don't need it anymore
   mTiming = nullptr;
 
   // clean up reload state for meta charset
   if (eCharsetReloadRequested == mCharsetReloadState) {
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -122,17 +122,16 @@ XPIDL_SOURCES += [
     'nsIUDPSocket.idl',
     'nsIUploadChannel.idl',
     'nsIUploadChannel2.idl',
     'nsIURI.idl',
     'nsIURIMutator.idl',
     'nsIURIWithSpecialOrigin.idl',
     'nsIURL.idl',
     'nsIURLParser.idl',
-    'nsPILoadGroupInternal.idl',
     'nsPISocketTransportService.idl',
 ]
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     XPIDL_SOURCES += [
         'nsIBrowserSearchService.idl',
     ]
 
--- a/netwerk/base/nsLoadGroup.cpp
+++ b/netwerk/base/nsLoadGroup.cpp
@@ -112,17 +112,16 @@ nsLoadGroup::~nsLoadGroup() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports methods:
 
 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)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIRequest methods:
@@ -688,28 +687,16 @@ nsLoadGroup::GetRootLoadGroup(nsILoadGro
   if (ancestor) return ancestor->GetRootLoadGroup(aRootLoadGroup);
 
   // finally just return this
   NS_ADDREF(*aRootLoadGroup = this);
   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:
 
 NS_IMETHODIMP
 nsLoadGroup::GetPriority(int32_t *aValue) {
   *aValue = mPriority;
   return NS_OK;
 }
 
--- a/netwerk/base/nsLoadGroup.h
+++ b/netwerk/base/nsLoadGroup.h
@@ -3,17 +3,16 @@
  * 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/. */
 
 #ifndef nsLoadGroup_h__
 #define nsLoadGroup_h__
 
 #include "nsILoadGroup.h"
 #include "nsILoadGroupChild.h"
-#include "nsPILoadGroupInternal.h"
 #include "nsAgg.h"
 #include "nsCOMPtr.h"
 #include "nsWeakReference.h"
 #include "nsISupportsPriority.h"
 #include "PLDHashTable.h"
 #include "mozilla/TimeStamp.h"
 
 class nsIRequestContext;
@@ -21,29 +20,27 @@ class nsIRequestContextService;
 class nsITimedChannel;
 
 namespace mozilla {
 namespace net {
 
 class nsLoadGroup : public nsILoadGroup,
                     public nsILoadGroupChild,
                     public nsISupportsPriority,
-                    public nsSupportsWeakReference,
-                    public nsPILoadGroupInternal {
+                    public nsSupportsWeakReference {
  public:
   NS_DECL_AGGREGATED
 
   ////////////////////////////////////////////////////////////////////////////
   // nsIRequest methods:
   NS_DECL_NSIREQUEST
 
   ////////////////////////////////////////////////////////////////////////////
   // nsILoadGroup methods:
   NS_DECL_NSILOADGROUP
-  NS_DECL_NSPILOADGROUPINTERNAL
 
   ////////////////////////////////////////////////////////////////////////////
   // nsILoadGroupChild methods:
   NS_DECL_NSILOADGROUPCHILD
 
   ////////////////////////////////////////////////////////////////////////////
   // nsISupportsPriority methods:
   NS_DECL_NSISUPPORTSPRIORITY
deleted file mode 100644
--- a/netwerk/base/nsPILoadGroupInternal.idl
+++ /dev/null
@@ -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);
-};