Bug 1966082 - Use keyed mutex instead of ID3D11Fence in CanvasTranslator when remote canvas is enabled r=gfx-reviewers,lsalzman

Reverted as to use keyed mutex as before.

Differential Revision: https://phabricator.services.mozilla.com/D249216

gfx/layers/client/TextureClient.h

@@ -97,6 +97,9 @@ enum TextureAllocationFlags {
 
   // Force allocation of remote/recorded texture, or fail if not possible.
   ALLOC_FORCE_REMOTE = 1 << 9,
+
+  // Prefer to use keyed mutex than D3D11Fence on Windows
+  USE_D3D11_KEYED_MUTEX = 1 << 10,
 };
 
 enum class BackendSelector { Content, Canvas };

gfx/layers/d3d11/TextureD3D11.cpp

@@ -557,8 +557,10 @@ D3D11TextureData* D3D11TextureData::Create(IntSize aSize, SurfaceFormat aFormat,
   if (!NS_IsMainThread()) {
     // On the main thread we use the syncobject to handle synchronization.
     if (!(aFlags & ALLOC_MANUAL_SYNCHRONIZATION)) {
+      if (!(aFlags & USE_D3D11_KEYED_MUTEX)) {
         auto* fencesHolderMap = CompositeProcessD3D11FencesHolderMap::Get();
         useFence = fencesHolderMap && FenceD3D11::IsSupported(device);
+      }
       if (!useFence) {
         newDesc.MiscFlags = D3D11_RESOURCE_MISC_SHARED_NTHANDLE |
                             D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX;

gfx/layers/ipc/CanvasTranslator.cpp

@@ -51,6 +51,12 @@ UniquePtr<TextureData> CanvasTranslator::CreateTextureData(
   switch (mTextureType) {
 #ifdef XP_WIN
     case TextureType::D3D11: {
+      // Prefer keyed mutex than D3D11Fence if remote canvas is enabled. See Bug
+      // 1966082
+      if (gfx::gfxVars::RemoteCanvasEnabled()) {
+        allocFlags =
+            (TextureAllocationFlags)(allocFlags | USE_D3D11_KEYED_MUTEX);
+      }
       textureData =
           D3D11TextureData::Create(aSize, aFormat, allocFlags, mDevice);
       break;