gh-12979: Import compositor patches from upstream (gh-13054)

Author: mr-cheffy

src/external-patches/firefox/gh-12979_1_add_gfxcriticalnote_to_dclayercompositionsurface.patch

@@ -0,0 +1,19 @@
+diff --git a/gfx/webrender_bindings/DCLayerTree.cpp b/gfx/webrender_bindings/DCLayerTree.cpp
+--- a/gfx/webrender_bindings/DCLayerTree.cpp
++++ b/gfx/webrender_bindings/DCLayerTree.cpp
+@@ -2097,10 +2097,14 @@
+   hr = mCompositionSurface->BeginDraw(&updateRect, __uuidof(ID3D11Texture2D),
+                                       (void**)getter_AddRefs(backBuffer),
+                                       &offset);
+ 
+   if (FAILED(hr)) {
++    LayoutDeviceIntRect rect = widget::WinUtils::ToIntRect(updateRect);
++
++    gfxCriticalNote << "DCLayerCompositionSurface::Bind failed: "
++                    << gfx::hexa(hr) << " " << rect;
+     RenderThread::Get()->HandleWebRenderError(WebRenderError::BEGIN_DRAW);
+     return;
+   }
+ 
+   const auto gl = mDCLayerTree->GetGLContext();
+

src/external-patches/firefox/gh-12979_2_compositor_rendering_performance_fix.patch

@@ -0,0 +1,43 @@
+diff --git a/gfx/webrender_bindings/DCLayerTree.cpp b/gfx/webrender_bindings/DCLayerTree.cpp
+--- a/gfx/webrender_bindings/DCLayerTree.cpp
++++ b/gfx/webrender_bindings/DCLayerTree.cpp
+@@ -2182,18 +2182,18 @@
+ 
+     updatePos = {0, 0};
+   }
+ 
+   mFirstDraw = false;
++  LayoutDeviceIntRect rect = widget::WinUtils::ToIntRect(updateRect);
++  MOZ_ASSERT(!rect.IsEmpty());
+ 
+   hr = mCompositionSurface->BeginDraw(&updateRect, __uuidof(ID3D11Texture2D),
+                                       (void**)getter_AddRefs(backBuffer),
+                                       &offset);
+ 
+   if (FAILED(hr)) {
+-    LayoutDeviceIntRect rect = widget::WinUtils::ToIntRect(updateRect);
+-
+     gfxCriticalNote << "DCLayerCompositionSurface::Bind failed: "
+                     << gfx::hexa(hr) << " " << rect;
+     RenderThread::Get()->HandleWebRenderError(WebRenderError::BEGIN_DRAW);
+     return;
+   }
+diff --git a/gfx/wr/webrender/src/renderer/composite.rs b/gfx/wr/webrender/src/renderer/composite.rs
+--- a/gfx/wr/webrender/src/renderer/composite.rs
++++ b/gfx/wr/webrender/src/renderer/composite.rs
+@@ -1120,11 +1120,13 @@
+             // Only use supplied clear color for first content layer we encounter
+             let clear_color = content_clear_color.take().unwrap_or(ColorF::TRANSPARENT);
+ 
+             if let Some(ref mut _compositor) = self.compositor_config.layer_compositor() {
+                 if let Some(PartialPresentMode::Single { dirty_rect }) = partial_present_mode {
+-                    if dirty_rect.is_empty() {
++                    let device_rect = DeviceRect::from_size(device_size.to_f32());
++                    let clipped_dirty_rect = dirty_rect.intersection_unchecked(&device_rect);
++                    if clipped_dirty_rect.is_empty() {
+                         continue;
+                     }
+                 }
+             }
+ 
+

src/external-patches/firefox/gh-12979_3_clip_dirty_rect_to_device_size.patch

@@ -0,0 +1,21 @@
+diff --git a/gfx/wr/webrender/src/renderer/composite.rs b/gfx/wr/webrender/src/renderer/composite.rs
+--- a/gfx/wr/webrender/src/renderer/composite.rs
++++ b/gfx/wr/webrender/src/renderer/composite.rs
+@@ -974,12 +974,15 @@
+                     .iter()
+                     .chain(self.layer_compositor_frame_state_in_prev_frame.as_ref().unwrap().rects_without_id.iter())  {
+                     combined_dirty_rect = combined_dirty_rect.union(&rect);
+                 }
+ 
++                let device_rect = DeviceRect::from_size(device_size.to_f32());
++                let clipped_dirty_rect = combined_dirty_rect.intersection_unchecked(&device_rect);
++
+                 partial_present_mode = Some(PartialPresentMode::Single {
+-                    dirty_rect: combined_dirty_rect,
++                    dirty_rect: clipped_dirty_rect,
+                 });
+             } else {
+                 partial_present_mode = None;
+             }
+ 
+

src/external-patches/manifest.json

@@ -2,11 +2,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 [
-  {
-    "type": "phabricator",
-    "id": "D279007",
-    "name": "Fix MacOS Crash on Shutdown Firefox 149"
-  },
   {
     "type": "phabricator",
     "id": "D284084",
@@ -40,5 +35,20 @@
       // the parameter's help description with the correct one.
       "application": "Application"
     }
+  },
+  {
+    "type": "phabricator",
+    "id": "D291099",
+    "name": "gh-12979 1 Add gfxCriticalNote to DCLayerCompositionSurface" 
+  },
+  {
+    "type": "phabricator",
+    "id": "D291123",
+    "name": "gh-12979 2 Compositor rendering performance fix"
+  },
+  {
+    "type": "phabricator",
+    "id": "D291714",
+    "name": "gh-12979 3 Clip dirty_rect to device_size"
   }
 ]