Backed out changeset 96ef0dd840e8 (bug 1299415) for TextureClient ass…

…erts/crashes in various test suites.
dothq · Sep 1, 2016 · 6119440 · 6119440
1 parent c915299
commit 6119440
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/dom/media/VideoFrameContainer.cpp b/dom/media/VideoFrameContainer.cpp
@@ -294,12 +294,6 @@ void VideoFrameContainer::ClearFutureFrames()
   }
 }
 
-void
-VideoFrameContainer::ClearCachedResources()
-{
-  mImageContainer->ClearCachedResources();
-}
-
 ImageContainer* VideoFrameContainer::GetImageContainer() {
   return mImageContainer;
 }

diff --git a/dom/media/VideoFrameContainer.h b/dom/media/VideoFrameContainer.h
@@ -73,9 +73,6 @@ class VideoFrameContainer : public MediaStreamVideoSink {
   // but was actually painted at t+n, this returns n in seconds. Threadsafe.
   double GetFrameDelay();
 
-  // Clear any resources that are not immediately necessary.
-  void ClearCachedResources();
-
   // Returns a new frame ID for SetCurrentFrames().  The client must either
   // call this on only one thread or provide barriers.  Do not use together
   // with SetCurrentFrame().

diff --git a/dom/media/mediasink/VideoSink.cpp b/dom/media/mediasink/VideoSink.cpp
@@ -145,9 +145,6 @@ VideoSink::SetPlaying(bool aPlaying)
     mUpdateScheduler.Reset();
     // Since playback is paused, tell compositor to render only current frame.
     RenderVideoFrames(1);
-    if (mContainer) {
-      mContainer->ClearCachedResources();
-    }
   }
 
   mAudioSink->SetPlaying(aPlaying);