Bug 1007577 - [RTSP] Remove nsIInterfaceRequestor from RtspControllerParent. r=sworkman
authorEthan Tseng <ettseng@mozilla.com>
Fri, 09 May 2014 15:08:09 +0800
changeset 201804 bc2092f2f3bed9a0d7eeb9d3f5178df05069d0b0
parent 201803 08cbbdb5a1347b18169635c93420424c20f8dce5
child 201805 18e2c5f74ea8e05db997a977f012cdcc72e29920
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssworkman
bugs1007577
milestone32.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 1007577 - [RTSP] Remove nsIInterfaceRequestor from RtspControllerParent. r=sworkman
netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
netwerk/protocol/rtsp/controller/RtspControllerParent.h
--- a/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
+++ b/netwerk/protocol/rtsp/controller/RtspControllerParent.cpp
@@ -51,17 +51,16 @@ RtspControllerParent::Destroy()
   } else {
     delete this;
   }
 }
 
 NS_IMPL_ADDREF(RtspControllerParent)
 NS_IMPL_RELEASE_WITH_DESTROY(RtspControllerParent, Destroy())
 NS_IMPL_QUERY_INTERFACE(RtspControllerParent,
-                        nsIInterfaceRequestor,
                         nsIStreamingProtocolListener)
 
 RtspControllerParent::RtspControllerParent()
   : mIPCOpen(true)
   , mTotalTracks(0)
 {
 #if defined(PR_LOGGING)
   if (!gRtspLog)
@@ -286,17 +285,10 @@ RtspControllerParent::OnDisconnected(uin
     return NS_ERROR_FAILURE;
   }
   if (mController) {
     mController = nullptr;
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP
-RtspControllerParent::GetInterface(const nsIID & iid, void **result)
-{
-  LOG(("RtspControllerParent::GetInterface()"));
-  return QueryInterface(iid, result);
-}
-
 } // namespace net
 } // namespace mozilla
--- a/netwerk/protocol/rtsp/controller/RtspControllerParent.h
+++ b/netwerk/protocol/rtsp/controller/RtspControllerParent.h
@@ -5,34 +5,31 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef RtspControllerParent_h
 #define RtspControllerParent_h
 
 #include "mozilla/net/PRtspControllerParent.h"
 #include "mozilla/net/NeckoParent.h"
 #include "nsIStreamingProtocolController.h"
-#include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 
 class nsIAuthPromptProvider;
 
 namespace mozilla {
 namespace net {
 
 class RtspControllerParent : public PRtspControllerParent
-                           , public nsIInterfaceRequestor
                            , public nsIStreamingProtocolListener
 {
  public:
   NS_DECL_THREADSAFE_ISUPPORTS
-  NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSISTREAMINGPROTOCOLLISTENER
 
   RtspControllerParent();
   ~RtspControllerParent();
 
   bool RecvAsyncOpen(const URIParams& aURI);
   bool RecvPlay();
   bool RecvPause();