Bug 1455676 part 5. Remove nsIDOMNode usage from netwerk/. r=qdot

Author: bzbarsky

dom/websocket/WebSocket.cpp

@@ -1865,7 +1865,7 @@ WebSocketImpl::InitializeConnection(nsIPrincipal* aPrincipal)
   // and aPrincipal are same origin.
   MOZ_ASSERT(!doc || doc->NodePrincipal()->Equals(aPrincipal));
 
-  rv = wsChannel->InitLoadInfo(doc ? doc->AsDOMNode() : nullptr,
+  rv = wsChannel->InitLoadInfo(doc,
                                doc ? doc->NodePrincipal() : aPrincipal,
                                aPrincipal,
                                nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,

netwerk/base/nsIIOService.idl

@@ -9,10 +9,11 @@ interface nsIProtocolHandler;
 interface nsIChannel;
 interface nsIURI;
 interface nsIFile;
-interface nsIDOMNode;
 interface nsIPrincipal;
 interface nsILoadInfo;
 
+webidl Node;
+
 %{C++
 #include "mozilla/Maybe.h"
 
@@ -101,15 +102,15 @@ interface nsIIOService : nsISupports
      * systemPrincipal as the loadingPrincipal.
      */
     nsIChannel newChannelFromURI2(in nsIURI aURI,
-                                  in nsIDOMNode aLoadingNode,
+                                  in Node aLoadingNode,
                                   in nsIPrincipal aLoadingPrincipal,
                                   in nsIPrincipal aTriggeringPrincipal,
                                   in unsigned long aSecurityFlags,
                                   in unsigned long aContentPolicyType);
 
     [noscript, nostdcall, notxpcom]
     nsresult NewChannelFromURIWithClientAndController(in nsIURI aURI,
-                                                      in nsIDOMNode aLoadingNode,
+                                                      in Node aLoadingNode,
                                                       in nsIPrincipal aLoadingPrincipal,
                                                       in nsIPrincipal aTriggeringPrincipal,
                                                       in const_MaybeClientInfoRef aLoadingClientInfo,
@@ -130,7 +131,7 @@ interface nsIIOService : nsISupports
     nsIChannel newChannel2(in AUTF8String aSpec,
                            in string aOriginCharset,
                            in nsIURI aBaseURI,
-                           in nsIDOMNode aLoadingNode,
+                           in Node aLoadingNode,
                            in nsIPrincipal aLoadingPrincipal,
                            in nsIPrincipal aTriggeringPrincipal,
                            in unsigned long aSecurityFlags,
@@ -228,7 +229,7 @@ interface nsIIOService : nsISupports
     nsIChannel newChannelFromURIWithProxyFlags2(in nsIURI aURI,
                                                 in nsIURI aProxyURI,
                                                 in unsigned long aProxyFlags,
-                                                in nsIDOMNode aLoadingNode,
+                                                in Node aLoadingNode,
                                                 in nsIPrincipal aLoadingPrincipal,
                                                 in nsIPrincipal aTriggeringPrincipal,
                                                 in unsigned long aSecurityFlags,

netwerk/base/nsIOService.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/DebugOnly.h"
 
 #include "nsIOService.h"
-#include "nsIDOMNode.h"
 #include "nsIProtocolHandler.h"
 #include "nsIFileProtocolHandler.h"
 #include "nscore.h"
@@ -717,7 +716,7 @@ nsIOService::NewFileURI(nsIFile *file, nsIURI **result)
 
 NS_IMETHODIMP
 nsIOService::NewChannelFromURI2(nsIURI* aURI,
-                                nsIDOMNode* aLoadingNode,
+                                nsINode* aLoadingNode,
                                 nsIPrincipal* aLoadingPrincipal,
                                 nsIPrincipal* aTriggeringPrincipal,
                                 uint32_t aSecurityFlags,
@@ -736,7 +735,7 @@ nsIOService::NewChannelFromURI2(nsIURI* aURI,
 }
 nsresult
 nsIOService::NewChannelFromURIWithClientAndController(nsIURI* aURI,
-                                                      nsIDOMNode* aLoadingNode,
+                                                      nsINode* aLoadingNode,
                                                       nsIPrincipal* aLoadingPrincipal,
                                                       nsIPrincipal* aTriggeringPrincipal,
                                                       const Maybe<ClientInfo>& aLoadingClientInfo,
@@ -775,7 +774,7 @@ nsresult
 nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
                                                      nsIURI* aProxyURI,
                                                      uint32_t aProxyFlags,
-                                                     nsIDOMNode* aLoadingNode,
+                                                     nsINode* aLoadingNode,
                                                      nsIPrincipal* aLoadingPrincipal,
                                                      nsIPrincipal* aTriggeringPrincipal,
                                                      const Maybe<ClientInfo>& aLoadingClientInfo,
@@ -799,10 +798,9 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
     // types do.
     if (aLoadingNode || aLoadingPrincipal ||
         aContentPolicyType == nsIContentPolicy::TYPE_DOCUMENT) {
-      nsCOMPtr<nsINode> loadingNode(do_QueryInterface(aLoadingNode));
       loadInfo = new LoadInfo(aLoadingPrincipal,
                               aTriggeringPrincipal,
-                              loadingNode,
+                              aLoadingNode,
                               aSecurityFlags,
                               aContentPolicyType,
                               aLoadingClientInfo,
@@ -934,7 +932,7 @@ NS_IMETHODIMP
 nsIOService::NewChannelFromURIWithProxyFlags2(nsIURI* aURI,
                                               nsIURI* aProxyURI,
                                               uint32_t aProxyFlags,
-                                              nsIDOMNode* aLoadingNode,
+                                              nsINode* aLoadingNode,
                                               nsIPrincipal* aLoadingPrincipal,
                                               nsIPrincipal* aTriggeringPrincipal,
                                               uint32_t aSecurityFlags,
@@ -958,7 +956,7 @@ NS_IMETHODIMP
 nsIOService::NewChannel2(const nsACString& aSpec,
                          const char* aCharset,
                          nsIURI* aBaseURI,
-                         nsIDOMNode* aLoadingNode,
+                         nsINode* aLoadingNode,
                          nsIPrincipal* aLoadingPrincipal,
                          nsIPrincipal* aTriggeringPrincipal,
                          uint32_t aSecurityFlags,

netwerk/base/nsIOService.h

@@ -148,7 +148,7 @@ class nsIOService final : public nsIIOService
     nsresult NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
                                                     nsIURI* aProxyURI,
                                                     uint32_t aProxyFlags,
-                                                    nsIDOMNode* aLoadingNode,
+                                                    nsINode* aLoadingNode,
                                                     nsIPrincipal* aLoadingPrincipal,
                                                     nsIPrincipal* aTriggeringPrincipal,
                                                     const mozilla::Maybe<mozilla::dom::ClientInfo>& aLoadingClientInfo,

netwerk/base/nsNetUtil.cpp

@@ -365,8 +365,7 @@ NS_NewChannelInternal(nsIChannel           **outChannel,
   nsCOMPtr<nsIChannel> channel;
   rv = aIoService->NewChannelFromURIWithClientAndController(
          aUri,
-         aLoadingNode ?
-           aLoadingNode->AsDOMNode() : nullptr,
+         aLoadingNode,
          aLoadingPrincipal,
          aTriggeringPrincipal,
          aLoadingClientInfo,

netwerk/protocol/http/nsCORSListenerProxy.cpp

@@ -35,7 +35,6 @@
 #include "nsILoadGroup.h"
 #include "nsILoadContext.h"
 #include "nsIConsoleService.h"
-#include "nsIDOMNode.h"
 #include "nsIDOMWindowUtils.h"
 #include "nsIDOMWindow.h"
 #include "nsINetworkInterceptController.h"

netwerk/protocol/websocket/BaseWebSocketChannel.cpp

@@ -14,7 +14,6 @@
 #include "nsProxyRelease.h"
 #include "nsStandardURL.h"
 #include "LoadInfo.h"
-#include "nsIDOMNode.h"
 #include "mozilla/dom/ContentChild.h"
 #include "nsITransportProvider.h"
 
@@ -215,15 +214,14 @@ BaseWebSocketChannel::SetPingTimeout(uint32_t aSeconds)
 }
 
 NS_IMETHODIMP
-BaseWebSocketChannel::InitLoadInfo(nsIDOMNode* aLoadingNode,
+BaseWebSocketChannel::InitLoadInfo(nsINode* aLoadingNode,
                                    nsIPrincipal* aLoadingPrincipal,
                                    nsIPrincipal* aTriggeringPrincipal,
                                    uint32_t aSecurityFlags,
                                    uint32_t aContentPolicyType)
 {
-  nsCOMPtr<nsINode> node = do_QueryInterface(aLoadingNode);
   mLoadInfo = new LoadInfo(aLoadingPrincipal, aTriggeringPrincipal,
-                           node, aSecurityFlags, aContentPolicyType);
+                           aLoadingNode, aSecurityFlags, aContentPolicyType);
   return NS_OK;
 }
 

netwerk/protocol/websocket/BaseWebSocketChannel.h

@@ -52,7 +52,7 @@ class BaseWebSocketChannel : public nsIWebSocketChannel,
   NS_IMETHOD SetPingInterval(uint32_t aSeconds) override;
   NS_IMETHOD GetPingTimeout(uint32_t *aSeconds) override;
   NS_IMETHOD SetPingTimeout(uint32_t aSeconds) override;
-  NS_IMETHOD InitLoadInfo(nsIDOMNode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,
+  NS_IMETHOD InitLoadInfo(nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,
                           nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags,
                           uint32_t aContentPolicyType) override;
   NS_IMETHOD GetSerial(uint32_t* aSerial) override;

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -3489,8 +3489,7 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
               mURI,
               nsIProtocolProxyService::RESOLVE_PREFER_HTTPS_PROXY |
               nsIProtocolProxyService::RESOLVE_ALWAYS_TUNNEL,
-              mLoadInfo->LoadingNode() ?
-                mLoadInfo->LoadingNode()->AsDOMNode() : nullptr,
+              mLoadInfo->LoadingNode(),
               mLoadInfo->LoadingPrincipal(),
               mLoadInfo->TriggeringPrincipal(),
               mLoadInfo->GetSecurityFlags(),

netwerk/protocol/websocket/nsIWebSocketChannel.idl

@@ -10,10 +10,11 @@ interface nsILoadGroup;
 interface nsIWebSocketListener;
 interface nsIInputStream;
 interface nsILoadInfo;
-interface nsIDOMNode;
 interface nsIPrincipal;
 interface nsITransportProvider;
 
+webidl Node;
+
 #include "nsISupports.idl"
 
 /**
@@ -88,7 +89,7 @@ interface nsIWebSocketChannel : nsISupports
      * then loadingPrincipal must be equal to loadingNode->NodePrincipal().
      * But less error prone is to just supply a loadingNode.
      */
-     [must_use] void initLoadInfo(in nsIDOMNode aLoadingNode,
+     [must_use] void initLoadInfo(in Node aLoadingNode,
                                   in nsIPrincipal aLoadingPrincipal,
                                   in nsIPrincipal aTriggeringPrincipal,
                                   in unsigned long aSecurityFlags,