Backed out changeset 537608d1e4cc (bug 1621345) for many ns related crashes CLOSED TREE

Author: bogdant-old

dom/websocket/WebSocket.cpp

@@ -66,7 +66,6 @@
 #include "nsIWebSocketListener.h"
 #include "nsProxyRelease.h"
 #include "nsWeakReference.h"
-#include "nsIWebSocketImpl.h"
 
 #define OPEN_EVENT_STRING NS_LITERAL_STRING("open")
 #define MESSAGE_EVENT_STRING NS_LITERAL_STRING("message")
@@ -83,16 +82,14 @@ class WebSocketImpl final : public nsIInterfaceRequestor,
                             public nsIObserver,
                             public nsSupportsWeakReference,
                             public nsIRequest,
-                            public nsIEventTarget,
-                            public nsIWebSocketImpl {
+                            public nsIEventTarget {
  public:
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSIWEBSOCKETLISTENER
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIREQUEST
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIEVENTTARGET_FULL
-  NS_DECL_NSIWEBSOCKETIMPL
 
   explicit WebSocketImpl(WebSocket* aWebSocket)
       : mWebSocket(aWebSocket),
@@ -240,7 +237,7 @@ class WebSocketImpl final : public nsIInterfaceRequestor,
 
 NS_IMPL_ISUPPORTS(WebSocketImpl, nsIInterfaceRequestor, nsIWebSocketListener,
                   nsIObserver, nsISupportsWeakReference, nsIRequest,
-                  nsIEventTarget, nsIWebSocketImpl)
+                  nsIEventTarget)
 
 class CallDispatchConnectionCloseEvents final : public CancelableRunnable {
  public:
@@ -616,22 +613,6 @@ void WebSocketImpl::DisconnectInternal() {
   }
 }
 
-//-----------------------------------------------------------------------------
-// WebSocketImpl::nsIWebSocketImpl
-//-----------------------------------------------------------------------------
-
-NS_IMETHODIMP
-WebSocketImpl::SendMessage(const nsAString& aMessage) {
-  nsString message(aMessage);
-  nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
-      "WebSocketImpl::SendMessage",
-      [self = RefPtr<WebSocketImpl>(this), message = std::move(message)]() {
-        ErrorResult IgnoredErrorResult;
-        self->mWebSocket->Send(message, IgnoredErrorResult);
-      });
-  return Dispatch(runnable.forget(), NS_DISPATCH_NORMAL);
-}
-
 //-----------------------------------------------------------------------------
 // WebSocketImpl::nsIWebSocketListener methods:
 //-----------------------------------------------------------------------------
@@ -1798,11 +1779,6 @@ nsresult WebSocketImpl::InitializeConnection(
 
   mChannel = wsChannel;
 
-  nsWeakPtr mWeakWebSocketImpl = do_GetWeakReference(this);
-
-  mService->AssociateWebSocketImplWithSerialID(mWeakWebSocketImpl,
-                                               mChannel->Serial());
-
   if (mIsMainThread && doc) {
     mMainThreadEventTarget = doc->EventTargetFor(TaskCategory::Other);
   }

netwerk/protocol/websocket/WebSocketEventService.cpp

@@ -16,7 +16,6 @@
 #include "nsSocketTransportService2.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Services.h"
-#include "nsIWebSocketImpl.h"
 
 namespace mozilla {
 namespace net {
@@ -335,24 +334,6 @@ void WebSocketEventService::FrameSent(uint32_t aWebSocketSerialID,
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "NS_DispatchToMainThread failed");
 }
 
-void WebSocketEventService::AssociateWebSocketImplWithSerialID(
-    nsWeakPtr aWeakWebSocketImplPtr, uint32_t aWebSocketSerialID) {
-  this->mWeakWebSocketImpl.Put(aWebSocketSerialID, &aWeakWebSocketImplPtr);
-}
-
-NS_IMETHODIMP
-WebSocketEventService::SendMessage(uint32_t aWebSocketSerialID,
-                                   const nsAString& aMessage) {
-  nsresult rv = NS_OK;
-
-  nsWeakPtr WeakWebSocketImpl = *(mWeakWebSocketImpl.Get(aWebSocketSerialID));
-  nsCOMPtr<nsIWebSocketImpl> mWebSocketImpl =
-      do_QueryReferent(WeakWebSocketImpl);
-
-  rv = mWebSocketImpl->SendMessage(aMessage);
-  return rv;
-}
-
 NS_IMETHODIMP
 WebSocketEventService::AddListener(uint64_t aInnerWindowID,
                                    nsIWebSocketEventListener* aListener) {

netwerk/protocol/websocket/WebSocketEventService.h

@@ -62,9 +62,6 @@ class WebSocketEventService final : public nsIWebSocketEventService,
                  already_AddRefed<WebSocketFrame> aFrame,
                  nsIEventTarget* aTarget = nullptr);
 
-  void AssociateWebSocketImplWithSerialID(nsWeakPtr aWeakWebSocketImplPtr,
-                                          uint32_t aWebSocketSerialID);
-
   already_AddRefed<WebSocketFrame> CreateFrameIfNeeded(
       bool aFinBit, bool aRsvBit1, bool aRsvBit2, bool aRsvBit3,
       uint8_t aOpCode, bool aMaskBit, uint32_t aMask,
@@ -89,8 +86,6 @@ class WebSocketEventService final : public nsIWebSocketEventService,
 
   typedef nsTArray<nsCOMPtr<nsIWebSocketEventListener>> WindowListeners;
 
-  nsClassHashtable<nsUint32HashKey, nsWeakPtr> mWeakWebSocketImpl;
-
   struct WindowListener {
     WindowListeners mListeners;
     RefPtr<WebSocketEventListenerChild> mActor;

netwerk/protocol/websocket/moz.build

@@ -11,7 +11,6 @@ XPIDL_SOURCES += [
     'nsITransportProvider.idl',
     'nsIWebSocketChannel.idl',
     'nsIWebSocketEventService.idl',
-    'nsIWebSocketImpl.idl',
     'nsIWebSocketListener.idl',
 ]
 

netwerk/protocol/websocket/nsIWebSocketEventService.idl

@@ -6,8 +6,6 @@
 #include "domstubs.idl"
 #include "nsISupports.idl"
 
-interface nsIWeakReference;
-
 [scriptable, builtinclass, uuid(6714a6be-2265-4f73-a988-d78a12416037)]
 interface nsIWebSocketFrame : nsISupports
 {
@@ -74,9 +72,6 @@ interface nsIWebSocketEventListener : nsISupports
 [scriptable, builtinclass, uuid(b89d1b90-2cf3-4d8f-ac21-5aedfb25c760)]
 interface nsIWebSocketEventService : nsISupports
 {
-  [must_use] void sendMessage(in unsigned long aWebSocketSerialID,
-                                       in AString aMessage);
-
   [must_use] void addListener(in unsigned long long aInnerWindowID,
                               in nsIWebSocketEventListener aListener);
 

netwerk/protocol/websocket/nsIWebSocketImpl.idl

@@ -84,4 +84,7 @@ interface nsIWebSocketListener : nsISupports
     [must_use] void onServerClose(in nsISupports aContext,
                                   in unsigned short aCode,
                                   in AUTF8String aReason);
+
 };
+
+