chore: fix patch conflicts after chrome roll (#40664)

chore: fix patches after Chrome roll
electron · Nov 30, 2023 · d449c89 · d449c89
1 parent 53482c4
commit d449c89
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 350 deletions.
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
@@ -135,5 +135,3 @@ revert_same_party_cookie_attribute_removal.patch
 crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch
 scale_rects_properly_in_syncgetfirstrectforrange.patch
 fix_restore_original_resize_performance_on_macos.patch
-cherry-pick-3f45b1af5e41.patch
-cherry-pick-e13061c50998.patch
diff --git a/patches/chromium/cherry-pick-3f45b1af5e41.patch b/patches/chromium/cherry-pick-3f45b1af5e41.patch
diff --git a/patches/chromium/cherry-pick-e13061c50998.patch b/patches/chromium/cherry-pick-e13061c50998.patch
diff --git a/patches/config.json b/patches/config.json
@@ -11,8 +11,6 @@
 
   "src/electron/patches/node": "src/third_party/electron_node",
 
-  "src/electron/patches/libavif": "src/third_party/libavif/src",
-
   "src/electron/patches/nan": "src/third_party/nan",
 
   "src/electron/patches/perfetto": "src/third_party/perfetto",
@@ -23,7 +21,5 @@
 
   "src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
 
-  "src/electron/patches/skia": "src/third_party/skia",
-
   "src/electron/patches/webrtc": "src/third_party/webrtc"
 }
diff --git a/patches/libavif/.patches b/patches/libavif/.patches
diff --git a/patches/libavif/do_not_store_potentially_invalid_pointers.patch b/patches/libavif/do_not_store_potentially_invalid_pointers.patch
diff --git a/patches/libavif/remove_potential_out_of_bound_access_to_alphaitemindices.patch b/patches/libavif/remove_potential_out_of_bound_access_to_alphaitemindices.patch
diff --git a/patches/skia/.patches b/patches/skia/.patches
diff --git a/patches/skia/avoid_combining_extremely_large_meshes.patch b/patches/skia/avoid_combining_extremely_large_meshes.patch