Bug 1655115 - Remove unused code paths leading to dom::cache::StreamC…

…ontrol::CloseReadStreams() r=dom-workers-and-storage-reviewers,ttung Differential Revision: https://phabricator.services.mozilla.com/D85364
dothq · Aug 4, 2020 · 3ed5b7a · 3ed5b7a
1 parent 57df1c6
commit 3ed5b7a
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 57 deletions.
diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp
@@ -144,12 +144,6 @@ void CacheStreamControlChild::ActorDestroy(ActorDestroyReason aReason) {
   RemoveWorkerRef();
 }
 
-mozilla::ipc::IPCResult CacheStreamControlChild::RecvClose(const nsID& aId) {
-  NS_ASSERT_OWNINGTHREAD(CacheStreamControlChild);
-  CloseReadStreams(aId);
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult CacheStreamControlChild::RecvCloseAll() {
   NS_ASSERT_OWNINGTHREAD(CacheStreamControlChild);
   CloseAllReadStreams();

diff --git a/dom/cache/CacheStreamControlParent.cpp b/dom/cache/CacheStreamControlParent.cpp
@@ -133,12 +133,6 @@ void CacheStreamControlParent::SetStreamList(
   mStreamList = std::move(aStreamList);
 }
 
-void CacheStreamControlParent::Close(const nsID& aId) {
-  NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
-  NotifyClose(aId);
-  Unused << SendClose(aId);
-}
-
 void CacheStreamControlParent::CloseAll() {
   NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
   NotifyCloseAll();
@@ -154,11 +148,6 @@ void CacheStreamControlParent::Shutdown() {
   }
 }
 
-void CacheStreamControlParent::NotifyClose(const nsID& aId) {
-  NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
-  CloseReadStreams(aId);
-}
-
 void CacheStreamControlParent::NotifyCloseAll() {
   NS_ASSERT_OWNINGTHREAD(CacheStreamControlParent);
   CloseAllReadStreams();

diff --git a/dom/cache/CacheStreamControlParent.h b/dom/cache/CacheStreamControlParent.h
@@ -31,7 +31,6 @@ class CacheStreamControlParent final : public PCacheStreamControlParent,
   CacheStreamControlParent();
 
   void SetStreamList(SafeRefPtr<StreamList> aStreamList);
-  void Close(const nsID& aId);
   void CloseAll();
   void Shutdown();
 
@@ -62,7 +61,6 @@ class CacheStreamControlParent final : public PCacheStreamControlParent,
 
   mozilla::ipc::IPCResult RecvNoteClosed(const nsID& aId);
 
-  void NotifyClose(const nsID& aId);
   void NotifyCloseAll();
 
   // Cycle with StreamList via a weak-ref to us.  Cleanup occurs when the actor

diff --git a/dom/cache/PCacheStreamControl.ipdl b/dom/cache/PCacheStreamControl.ipdl
@@ -23,7 +23,6 @@ parent:
   async NoteClosed(nsID aStreamId);
 
 child:
-  async Close(nsID aStreamId);
   async CloseAll();
   async __delete__();
 };

diff --git a/dom/cache/ReadStream.cpp b/dom/cache/ReadStream.cpp
@@ -46,8 +46,6 @@ class ReadStream::Inner final : public ReadStream::Controllable {
 
   virtual void CloseStreamWithoutReporting() override;
 
-  virtual bool MatchId(const nsID& aId) const override;
-
   virtual bool HasEverBeenRead() const override;
 
   // Simulate nsIInputStream methods, but we don't actually inherit from it
@@ -247,11 +245,6 @@ void ReadStream::Inner::CloseStreamWithoutReporting() {
   Forget();
 }
 
-bool ReadStream::Inner::MatchId(const nsID& aId) const {
-  MOZ_ASSERT(mOwningEventTarget->IsOnCurrentThread());
-  return mId.Equals(aId);
-}
-
 bool ReadStream::Inner::HasEverBeenRead() const {
   MOZ_ASSERT(mOwningEventTarget->IsOnCurrentThread());
   return mHasEverBeenRead;

diff --git a/dom/cache/ReadStream.h b/dom/cache/ReadStream.h
@@ -61,8 +61,6 @@ class ReadStream final : public nsIInputStream {
     // notify.
     virtual void CloseStreamWithoutReporting() = 0;
 
-    virtual bool MatchId(const nsID& aId) const = 0;
-
     virtual bool HasEverBeenRead() const = 0;
 
     MOZ_DECLARE_REFCOUNTED_TYPENAME(ReadStream::Controllable);

diff --git a/dom/cache/StreamControl.cpp b/dom/cache/StreamControl.cpp
@@ -36,24 +36,6 @@ StreamControl::~StreamControl() {
   MOZ_DIAGNOSTIC_ASSERT(mReadStreamList.IsEmpty());
 }
 
-void StreamControl::CloseReadStreams(const nsID& aId) {
-  AssertOwningThread();
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  uint32_t closedCount = 0;
-#endif
-
-  for (const auto& stream : mReadStreamList.ForwardRange()) {
-    if (stream->MatchId(aId)) {
-      stream->CloseStream();
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-      closedCount += 1;
-#endif
-    }
-  }
-
-  MOZ_DIAGNOSTIC_ASSERT(closedCount > 0);
-}
-
 void StreamControl::CloseAllReadStreams() {
   AssertOwningThread();
 

diff --git a/dom/cache/StreamControl.h b/dom/cache/StreamControl.h
@@ -54,8 +54,6 @@ class StreamControl {
  protected:
   ~StreamControl();
 
-  void CloseReadStreams(const nsID& aId);
-
   void CloseAllReadStreams();
 
   void CloseAllReadStreamsWithoutReporting();

diff --git a/dom/cache/StreamList.cpp b/dom/cache/StreamList.cpp
@@ -124,13 +124,6 @@ void StreamList::NoteClosedAll() {
   }
 }
 
-void StreamList::Close(const nsID& aId) {
-  NS_ASSERT_OWNINGTHREAD(StreamList);
-  if (mStreamControl) {
-    mStreamControl->Close(aId);
-  }
-}
-
 void StreamList::CloseAll() {
   NS_ASSERT_OWNINGTHREAD(StreamList);
   if (mStreamControl) {

diff --git a/dom/cache/StreamList.h b/dom/cache/StreamList.h
@@ -39,7 +39,6 @@ class StreamList final : public Context::Activity,
 
   void NoteClosed(const nsID& aId);
   void NoteClosedAll();
-  void Close(const nsID& aId);
   void CloseAll();
 
   // Context::Activity methods