Backed out changeset 994147e6fd70 (bug 1405562) for build bustages on obj-firefox/dist/include/mozilla/layers/KnowsCompositor.h💯75 r=backout on a CLOSED TREE

dom/media/MediaData.cpp

@@ -323,7 +323,8 @@ VideoData::CreateAndCopyData(const VideoInfo& aInfo,
   // We disable this code path on Windows version earlier of Windows 8 due to
   // intermittent crashes with old drivers. See bug 1405110.
   if (IsWin8OrLater() && !XRE_IsParentProcess() &&
-      aAllocator && aAllocator->SupportsD3D11()) {
+      aAllocator && aAllocator->GetCompositorBackendType()
+                    == layers::LayersBackend::LAYERS_D3D11) {
     RefPtr<layers::D3D11YCbCrImage> d3d11Image = new layers::D3D11YCbCrImage();
     PlanarYCbCrData data = ConstructPlanarYCbCrData(aInfo, aBuffer, aPicture);
     if (d3d11Image->SetData(layers::ImageBridgeChild::GetSingleton()

dom/media/platforms/wmf/WMFVideoMFTManager.cpp

@@ -532,7 +532,11 @@ WMFVideoMFTManager::InitializeDXVA()
     return false;
   }
   MOZ_ASSERT(!mDXVA2Manager);
-  if (!mKnowsCompositor || !mKnowsCompositor->SupportsD3D11()) {
+  LayersBackend backend = GetCompositorBackendType(mKnowsCompositor);
+  bool useANGLE =
+      mKnowsCompositor ? mKnowsCompositor->GetCompositorUseANGLE() : false;
+  bool wrWithANGLE = (backend == LayersBackend::LAYERS_WR) && useANGLE;
+  if (backend != LayersBackend::LAYERS_D3D11 && !wrWithANGLE) {
     mDXVAFailureReason.AssignLiteral("Unsupported layers backend");
     return false;
   }

gfx/layers/ImageContainer.cpp

@@ -477,7 +477,8 @@ ImageContainer::GetD3D11YCbCrRecycleAllocator(KnowsCompositor* aAllocator)
     device = gfx::DeviceManagerDx::Get()->GetCompositorDevice();
   }
 
-  if (!device || !aAllocator->SupportsD3D11()) {
+  LayersBackend backend = aAllocator->GetCompositorBackendType();
+  if (!device || backend != LayersBackend::LAYERS_D3D11) {
     return nullptr;
   }
 

gfx/layers/ipc/KnowsCompositor.h

@@ -94,12 +94,6 @@ public:
     return mTextureFactoryIdentifier.mSupportsComponentAlpha;
   }
 
-  bool SupportsD3D11() const
-  {
-    return GetCompositorBackendType() == layers::LayersBackend::LAYERS_D3D11 ||
-           GetCompositorBackendType() == layers::LayersBackend::LAYERS_WR && GetCompositorUseANGLE();
-  }
-
   bool GetCompositorUseANGLE() const
   {
     return mTextureFactoryIdentifier.mCompositorUseANGLE;