Backed out changeset 2a7f99800581 (bug 1339748) for asserting in many tests on Windows 8 x64. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 18 Feb 2017 17:37:36 +0100
changeset 372727 72dc326b8410067c67dddd232fdec502ab370ef4
parent 372726 e26a2e2e873e206ef7d198c8b60f54d898f48501
child 372728 eb7a00775294b203a821afea2b59342f16a3914a
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1339748
milestone54.0a1
backs out2a7f99800581248d32956b95cd844e4e130d2980
Backed out changeset 2a7f99800581 (bug 1339748) for asserting in many tests on Windows 8 x64. r=backout
dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
dom/media/platforms/wrappers/MediaDataDecoderProxy.h
--- a/dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
+++ b/dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp
@@ -61,77 +61,21 @@ MediaDataDecoderProxy::Drain()
   return InvokeAsync(mProxyThread, __func__,
                      [self, this]() { return mProxyDecoder->Drain(); });
 }
 
 RefPtr<ShutdownPromise>
 MediaDataDecoderProxy::Shutdown()
 {
   MOZ_ASSERT(!mIsShutdown);
-
 #if defined(DEBUG)
   mIsShutdown = true;
 #endif
 
   if (!mProxyThread) {
     return mProxyDecoder->Shutdown();
   }
   RefPtr<MediaDataDecoderProxy> self = this;
   return InvokeAsync(mProxyThread, __func__,
                      [self, this]() { return mProxyDecoder->Shutdown(); });
 }
 
-const char*
-MediaDataDecoderProxy::GetDescriptionName() const
-{
-  MOZ_ASSERT(!mIsShutdown);
-
-  return mProxyDecoder->GetDescriptionName();
-}
-
-bool
-MediaDataDecoderProxy::IsHardwareAccelerated(nsACString& aFailureReason) const
-{
-  MOZ_ASSERT(!mIsShutdown);
-
-  return mProxyDecoder->IsHardwareAccelerated(aFailureReason);
-}
-
-void
-MediaDataDecoderProxy::SetSeekThreshold(const media::TimeUnit& aTime)
-{
-  MOZ_ASSERT(!mIsShutdown);
-
-  if (!mProxyThread) {
-    mProxyDecoder->SetSeekThreshold(aTime);
-    return;
-  }
-  RefPtr<MediaDataDecoderProxy> self = this;
-  media::TimeUnit time = aTime;
-  mProxyThread->Dispatch(NS_NewRunnableFunction(
-    [self, time] { self->mProxyDecoder->SetSeekThreshold(time); }));
-}
-
-bool
-MediaDataDecoderProxy::SupportDecoderRecycling() const
-{
-  MOZ_ASSERT(!mIsShutdown);
-
-  return mProxyDecoder->SupportDecoderRecycling();
-}
-
-void
-MediaDataDecoderProxy::ConfigurationChanged(const TrackInfo& aConfig)
-{
-  MOZ_ASSERT(!mIsShutdown);
-
-  if (!mProxyThread) {
-    mProxyDecoder->ConfigurationChanged(aConfig);
-  }
-  RefPtr<MediaDataDecoderProxy> self = this;
-  RefPtr<TrackInfoSharedPtr> config = new TrackInfoSharedPtr(aConfig, 0);
-  mProxyThread->Dispatch(NS_NewRunnableFunction([self, config] {
-    const TrackInfo* trackInfo = *config;
-    self->mProxyDecoder->ConfigurationChanged(*trackInfo);
-  }));
-}
-
 } // namespace mozilla
--- a/dom/media/platforms/wrappers/MediaDataDecoderProxy.h
+++ b/dom/media/platforms/wrappers/MediaDataDecoderProxy.h
@@ -41,21 +41,21 @@ public:
     mProxyDecoder = aProxyDecoder;
   }
 
   RefPtr<InitPromise> Init() override;
   RefPtr<DecodePromise> Decode(MediaRawData* aSample) override;
   RefPtr<DecodePromise> Drain() override;
   RefPtr<FlushPromise> Flush() override;
   RefPtr<ShutdownPromise> Shutdown() override;
-  const char* GetDescriptionName() const override;
-  bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
-  void SetSeekThreshold(const media::TimeUnit& aTime) override;
-  bool SupportDecoderRecycling() const override;
-  void ConfigurationChanged(const TrackInfo& aConfig) override;
+
+  const char* GetDescriptionName() const override
+  {
+    return mProxyDecoder->GetDescriptionName();
+  }
 
 private:
   RefPtr<MediaDataDecoder> mProxyDecoder;
   RefPtr<AbstractThread> mProxyThread;
 
 #if defined(DEBUG)
   Atomic<bool> mIsShutdown;
 #endif