Browse Source

chore: update patches

PatchUp 10 months ago
parent
commit
b6e9afd728

+ 1 - 1
patches/chromium/add_electron_deps_to_license_credits_file.patch

@@ -7,7 +7,7 @@ Ensure that licenses for the dependencies introduced by Electron
 are included in `LICENSES.chromium.html`
 
 diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
-index f3a8ba3756a19beb286a3f7bba52399705bf59bf..7cf72db56d3bc71cf6fb2b3f88a80e7866db1598 100755
+index 7390ac2a6667abface68318c742043f185e3ed2e..9d9f746387c62d4f846c31ec1887a1777a10ee1a 100755
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
 @@ -336,6 +336,31 @@ SPECIAL_CASES = {

+ 3 - 3
patches/chromium/blink_local_frame.patch

@@ -49,10 +49,10 @@ index 55343df3901f295f6570dfbcf74d326b6d0e1c4a..3ba0f8e60848147d61958f97d3ac0a89
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index f1c907d746a9e1fe7e963ef0986b639c33c35949..7b6d6474305df4bc1c1261a7fddc8ad4a3789142 100644
+index f017b58c85a2e1b285d4f3674fb6cc5237e8a358..d95b696c77b85d6d2b36f0c449e84ad023c17412 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -718,10 +718,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -730,10 +730,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index f1c907d746a9e1fe7e963ef0986b639c33c35949..7b6d6474305df4bc1c1261a7fddc8ad4
    if (!Client())
      return false;
  
-@@ -772,6 +768,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -786,6 +782,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  

+ 4 - 4
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -46,10 +46,10 @@ index 714564d8beb079fd0a7122c30ddf3fdf7362ecfa..39bc1b2aa648f73924f149801b5d707d
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1bc146003ac4f58e122b4c6af79d9d94bd13e84a..2442e6ae728f0873e6273f91b1bebbf7b71ba644 100644
+index 4d6ba17d1ee1ccd96e36cbcbf89dfba4d118b409..5af45461738762ae68455f932819885f115882b3 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7414,9 +7414,12 @@ test("unit_tests") {
+@@ -7416,9 +7416,12 @@ test("unit_tests") {
        "//chrome/browser/safe_browsing/incident_reporting/verifier_test:verifier_test_dll_2",
      ]
  
@@ -63,7 +63,7 @@ index 1bc146003ac4f58e122b4c6af79d9d94bd13e84a..2442e6ae728f0873e6273f91b1bebbf7
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -8416,6 +8419,10 @@ test("unit_tests") {
+@@ -8417,6 +8420,10 @@ test("unit_tests") {
        "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
      ]
  
@@ -74,7 +74,7 @@ index 1bc146003ac4f58e122b4c6af79d9d94bd13e84a..2442e6ae728f0873e6273f91b1bebbf7
      sources += [
        # The importer code is not used on Android.
        "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8493,7 +8500,6 @@ test("unit_tests") {
+@@ -8494,7 +8501,6 @@ test("unit_tests") {
      }
  
      deps += [

+ 2 - 2
patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 3de2b28f161185c6c5ac305a2a5800f77e3c5b9d..88bdeae51263088757d8d00507af13b5b2f1998d 100644
+index 74d7679d817aa74a9968b2371ca06ef5ade870b8..7187f9202a6b20020ad5904146868f1317259803 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -8543,6 +8543,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -8544,6 +8544,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,

+ 1 - 1
patches/chromium/chore_add_electron_deps_to_gitignores.patch

@@ -18,7 +18,7 @@ index 50992a3f4502d46a1bc2713c25bec6095c541ffa..121a09d7fa00162fe64ce901cae96d8f
  /googleurl
  /gpu/gles2_conform_test
 diff --git a/third_party/.gitignore b/third_party/.gitignore
-index 4f4e8f03bb876e5745ea6bcf07c2f8ba8b12bffb..de05f778dfc2ee1dabb70242b9a6201b7eea90e3 100644
+index dd03ce6ea14668478a6bce64b8c269d2c9d46a05..6fadd25f0351ce46d75120513efb1e6c463c2603 100644
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
 @@ -51,7 +51,9 @@

+ 1 - 1
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch

@@ -40,7 +40,7 @@ index f56d1011dda21f338a4d80d629bf26e269e51110..795c68a761306598a7c22b81bb1fb0e9
    // origin of |common_params.url| and/or |common_params.initiator_origin|.
    url::Origin resolved_origin = url::Origin::Resolve(
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
-index 2c6060062896029c7ac6787326abb1c113cb5e30..c322714ba00d3a2704888f9e4bc8c251939dd2c8 100644
+index 3ec0883615fad82a3debccabc9112b0b6905eb5a..5d86e417e2a80db466ccfb9adc0f20bd36edc051 100644
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
 @@ -2231,6 +2231,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {

+ 4 - 4
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch

@@ -64,10 +64,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..7a985067b1371604644d48159f2f5aa7
  
  #endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 7b6d6474305df4bc1c1261a7fddc8ad4a3789142..010c3020848a65d2185ed8d2784420d654f3e367 100644
+index d95b696c77b85d6d2b36f0c449e84ad023c17412..d581625a81b7286eb1be8896c194217420964e90 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -3060,6 +3060,7 @@ void LocalFrame::RequestExecuteScript(
+@@ -3076,6 +3076,7 @@ void LocalFrame::RequestExecuteScript(
      mojom::blink::EvaluationTiming evaluation_timing,
      mojom::blink::LoadEventBlockingOption blocking_option,
      WebScriptExecutionCallback callback,
@@ -75,7 +75,7 @@ index 7b6d6474305df4bc1c1261a7fddc8ad4a3789142..010c3020848a65d2185ed8d2784420d6
      BackForwardCacheAware back_forward_cache_aware,
      mojom::blink::WantResultOption want_result_option,
      mojom::blink::PromiseResultOption promise_behavior) {
-@@ -3093,7 +3094,7 @@ void LocalFrame::RequestExecuteScript(
+@@ -3109,7 +3110,7 @@ void LocalFrame::RequestExecuteScript(
    PausableScriptExecutor::CreateAndRun(
        script_state, std::move(script_sources), execute_script_policy,
        user_gesture, evaluation_timing, blocking_option, want_result_option,
@@ -85,7 +85,7 @@ index 7b6d6474305df4bc1c1261a7fddc8ad4a3789142..010c3020848a65d2185ed8d2784420d6
  
  void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
 diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
-index b47431ec0dd4010b7943e4efe0b22431cb4b89ac..8887252a29cbf76c32a8b4e2d05204b4d440cf8a 100644
+index 0da6278d80f365d840c9ac7c551f878c6adbeeea..4c082c719fa9641b6637ae9532ea5fc2bb075d7a 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.h
 +++ b/third_party/blink/renderer/core/frame/local_frame.h
 @@ -825,6 +825,7 @@ class CORE_EXPORT LocalFrame final

+ 1 - 1
patches/chromium/hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch

@@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
 Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
 
 diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
-index 0e4cdd69a21a8227df3dec74e6830896a0bef4bf..7900321c94d5afdb7e67cde8ef58bcad243a78fd 100755
+index ada1ebf645124bad2d8c714226ca01312e5aa73f..ffdff21e1497673a548f16a91102f4d8e817d15f 100755
 --- a/tools/clang/scripts/update.py
 +++ b/tools/clang/scripts/update.py
 @@ -304,6 +304,8 @@ def GetDefaultHostOs():

+ 1 - 1
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch

@@ -700,7 +700,7 @@ index a119b4439bfb9218c7aaf09dca8e78527da7f20d..faa813b003940280c6eeb87e70173019
  
  }  // namespace content
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
-index 6203908a60dddf8348027252beaf655f7301c58a..46be6aee9f6d2aff17bb3c044dbc7d63af5ba9b1 100644
+index 8b587af65ca45c9d70bfd48c3bd5fcee3825542b..7cf700dfd765283b88291a9dc5c19ec46a1a6a04 100644
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
 @@ -504,6 +504,7 @@ static_library("test_support") {

+ 2 - 2
patches/chromium/partially_revert_is_newly_created_to_allow_for_browser_initiated.patch

@@ -10,10 +10,10 @@ an about:blank check to this area.
 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index b425a26398ae2a133d4792230741a5a6f87be6b9..b4fe8a8850abbc677a507d376cdeb78288bde90e 100644
+index 8594a55d7f1814be8c44cedb3c112a0da05b9649..dfaf54d87b570eef8c0cffc7fce566dee84db9a1 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -786,8 +786,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
+@@ -787,8 +787,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
    // TODO(crbug.com/40092527): Consider adding a separate boolean that
    // tracks this instead of piggybacking `origin_calculation_debug_info`.
    if (renderer_side_origin.opaque() &&

+ 1 - 1
patches/chromium/printing.patch

@@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
 This patch also fixes callback for manual user cancellation and success.
 
 diff --git a/BUILD.gn b/BUILD.gn
-index a958dad6344b8660b38c3143f1dcf792a3bab43b..df6fd814d703bed76a7eba2ab54cacc3a79a63d0 100644
+index 2c0ecf25f6922282180bc68432a04cefd63b0474..14b035d8e404f37611ac1a5c7af2c3b7bf0d6cb0 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -978,7 +978,6 @@ if (is_win) {

+ 2 - 2
patches/chromium/webview_fullscreen.patch

@@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
 `api::WebContents::IsFullscreenForTabOrPending` value.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index 88bdeae51263088757d8d00507af13b5b2f1998d..b425a26398ae2a133d4792230741a5a6f87be6b9 100644
+index 7187f9202a6b20020ad5904146868f1317259803..8594a55d7f1814be8c44cedb3c112a0da05b9649 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -7702,6 +7702,17 @@ void RenderFrameHostImpl::EnterFullscreen(
+@@ -7703,6 +7703,17 @@ void RenderFrameHostImpl::EnterFullscreen(
      }
    }