Backed out changeset 87b9aa4a22e9 (bug 1263991)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 07 Jun 2016 12:10:22 +0200
changeset 300876 fce105195b1594b64ad75ed90380d5b94641432b
parent 300875 25cf270ae8c54aae735d5657cb5118a277eeef0a
child 300877 dad1a1fcd0e5d75d261a2caa2013d1178c8c2f7c
push id19599
push usercbook@mozilla.com
push dateWed, 08 Jun 2016 10:16:21 +0000
treeherderfx-team@81f4cc3f6f4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1263991
milestone50.0a1
backs out87b9aa4a22e9e5dab4d1dea3babaa9c8524c96a0
Backed out changeset 87b9aa4a22e9 (bug 1263991)
dom/flyweb/FlyWebPublishedServer.cpp
--- a/dom/flyweb/FlyWebPublishedServer.cpp
+++ b/dom/flyweb/FlyWebPublishedServer.cpp
@@ -264,54 +264,50 @@ FlyWebPublishedServerChild::FlyWebPublis
   // ContentChild::DeallocPFlyWebPublishedServerChild
   NS_ADDREF_THIS();
 }
 
 bool
 FlyWebPublishedServerChild::RecvServerReady(const nsresult& aStatus)
 {
   LOG_I("FlyWebPublishedServerChild::RecvServerReady(%p)", this);
-  MOZ_ASSERT(!mActorDestroyed);
 
   PublishedServerStarted(aStatus);
   return true;
 }
 
 bool
 FlyWebPublishedServerChild::RecvServerClose()
 {
   LOG_I("FlyWebPublishedServerChild::RecvServerClose(%p)", this);
-  MOZ_ASSERT(!mActorDestroyed);
 
   Close();
 
   return true;
 }
 
 bool
 FlyWebPublishedServerChild::RecvFetchRequest(const IPCInternalRequest& aRequest,
                                              const uint64_t& aRequestId)
 {
   LOG_I("FlyWebPublishedServerChild::RecvFetchRequest(%p)", this);
-  MOZ_ASSERT(!mActorDestroyed);
 
   RefPtr<InternalRequest> request = new InternalRequest(aRequest);
   mPendingRequests.Put(request, aRequestId);
   FireFetchEvent(request);
 
   return true;
 }
 
 bool
 FlyWebPublishedServerChild::RecvWebSocketRequest(const IPCInternalRequest& aRequest,
                                                  const uint64_t& aRequestId,
                                                  PTransportProviderChild* aProvider)
 {
   LOG_I("FlyWebPublishedServerChild::RecvWebSocketRequest(%p)", this);
-  MOZ_ASSERT(!mActorDestroyed);
 
   RefPtr<InternalRequest> request = new InternalRequest(aRequest);
   mPendingRequests.Put(request, aRequestId);
 
   // Not addreffing here. The addref was already done when the
   // PTransportProvider child constructor original ran.
   mPendingTransportProviders.Put(aRequestId,
     dont_AddRef(static_cast<TransportProviderChild*>(aProvider)));
@@ -534,18 +530,16 @@ FlyWebPublishedServerParent::HandleEvent
 
   return NS_OK;
 }
 
 bool
 FlyWebPublishedServerParent::RecvFetchResponse(const IPCInternalResponse& aResponse,
                                                const uint64_t& aRequestId)
 {
-  MOZ_ASSERT(!mActorDestroyed);
-
   RefPtr<InternalRequest> request;
   mPendingRequests.Remove(aRequestId, getter_AddRefs(request));
   if (!request) {
      static_cast<ContentParent*>(Manager())->KillHard("unknown request id");
      return false;
   }
 
   RefPtr<InternalResponse> response = InternalResponse::FromIPC(aResponse);
@@ -554,18 +548,16 @@ FlyWebPublishedServerParent::RecvFetchRe
 
   return true;
 }
 
 bool
 FlyWebPublishedServerParent::RecvWebSocketResponse(const IPCInternalResponse& aResponse,
                                                    const uint64_t& aRequestId)
 {
-  MOZ_ASSERT(!mActorDestroyed);
-
   mPendingTransportProviders.Remove(aRequestId);
 
   RefPtr<InternalRequest> request;
   mPendingRequests.Remove(aRequestId, getter_AddRefs(request));
   if (!request) {
      static_cast<ContentParent*>(Manager())->KillHard("unknown websocket request id");
      return false;
   }
@@ -576,18 +568,16 @@ FlyWebPublishedServerParent::RecvWebSock
 
   return true;
 }
 
 bool
 FlyWebPublishedServerParent::RecvWebSocketAccept(const nsString& aProtocol,
                                                  const uint64_t& aRequestId)
 {
-  MOZ_ASSERT(!mActorDestroyed);
-
   RefPtr<TransportProviderParent> providerIPC;
   mPendingTransportProviders.Remove(aRequestId, getter_AddRefs(providerIPC));
 
   RefPtr<InternalRequest> request;
   mPendingRequests.Remove(aRequestId, getter_AddRefs(request));
 
   if (!request || !providerIPC) {
      static_cast<ContentParent*>(Manager())->KillHard("unknown websocket request id");
@@ -618,17 +608,16 @@ FlyWebPublishedServerParent::ActorDestro
 
   mActorDestroyed = true;
 }
 
 bool
 FlyWebPublishedServerParent::Recv__delete__()
 {
   LOG_I("FlyWebPublishedServerParent::Recv__delete__(%p)", this);
-  MOZ_ASSERT(!mActorDestroyed);
 
   if (mPublishedServer) {
     mPublishedServer->RemoveEventListener(NS_LITERAL_STRING("fetch"),
                                           this, false);
     mPublishedServer->RemoveEventListener(NS_LITERAL_STRING("websocket"),
                                           this, false);
     mPublishedServer->RemoveEventListener(NS_LITERAL_STRING("close"),
                                           this, false);