Bug 1676719 - Allow WebRender ANGLE in parent process for Nightly. r=jrmuizel

Depends on D96766

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

gfx/config/gfxConfigManager.cpp

@@ -42,10 +42,8 @@ void gfxConfigManager::Init() {
       StaticPrefs::gfx_webrender_max_partial_present_rects_AtStartup() > 0;
 #ifdef XP_WIN
   mWrForceAngle = StaticPrefs::gfx_webrender_force_angle_AtStartup();
-#  ifdef NIGHTLY_BUILD
   mWrForceAngleNoGPUProcess = StaticPrefs::
       gfx_webrender_enabled_no_gpu_process_with_angle_win_AtStartup();
-#  endif
   mWrDCompWinEnabled =
       Preferences::GetBool("gfx.webrender.dcomp-win.enabled", false);
 #endif

gfx/thebes/gfxPlatform.cpp

@@ -955,7 +955,7 @@ void gfxPlatform::Init() {
   // WebRender runs doesn't initialize gfxPlatform and performs explicit
   // initialization of the bits it needs.
   if (!UseWebRender()
-#if defined(XP_WIN) && defined(NIGHTLY_BUILD)
+#if defined(XP_WIN)
       || (UseWebRender() && XRE_IsParentProcess() &&
           !gfxConfig::IsEnabled(Feature::GPU_PROCESS) &&
           StaticPrefs::

gfx/webrender_bindings/RenderCompositorANGLE.cpp

@@ -217,9 +217,7 @@ HWND RenderCompositorANGLE::GetCompositorHwnd() {
 
   if (XRE_IsGPUProcess()) {
     hwnd = mWidget->AsWindows()->GetCompositorHwnd();
-  }
-#ifdef NIGHTLY_BUILD
-  else if (
+  } else if (
       StaticPrefs::
           gfx_webrender_enabled_no_gpu_process_with_angle_win_AtStartup()) {
     MOZ_ASSERT(XRE_IsParentProcess());
@@ -227,7 +225,6 @@ HWND RenderCompositorANGLE::GetCompositorHwnd() {
     // When GPU process does not exist, we do not need to use compositor window.
     hwnd = mWidget->AsWindows()->GetHwnd();
   }
-#endif
 
   return hwnd;
 }

modules/libpref/init/StaticPrefList.yaml

@@ -4454,10 +4454,14 @@
 # WebRender is not enabled when there is no GPU process on window when
 # WebRender uses ANGLE. It is for avoiding that WebGL and WebRender use ANGLE
 # at once. But there is a case that we want to enable WebRender for testing.
-#if defined(NIGHTLY_BUILD) && defined(XP_WIN)
+#ifdef XP_WIN
 - name: gfx.webrender.enabled-no-gpu-process-with-angle-win
   type: bool
+#ifdef NIGHTLY_BUILD
+  value: true
+#else
   value: false
+#endif
   mirror: once
 #endif