diff --git a/DEPS b/DEPS index 834ebfb20e..1c8042c4cb 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '144.0.7559.31', + '144.0.7559.59', 'node_version': 'v24.11.1', 'nan_version': diff --git a/patches/angle/.patches b/patches/angle/.patches index dbb398b99b..e69de29bb2 100644 --- a/patches/angle/.patches +++ b/patches/angle/.patches @@ -1 +0,0 @@ -cherry-pick-95a32cb37edb.patch diff --git a/patches/angle/cherry-pick-95a32cb37edb.patch b/patches/angle/cherry-pick-95a32cb37edb.patch deleted file mode 100644 index 10c301b297..0000000000 --- a/patches/angle/cherry-pick-95a32cb37edb.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Geoff Lang -Date: Fri, 5 Dec 2025 18:31:06 -0500 -Subject: Metal: Don't use pixelsDepthPitch to size buffers. - -pixelsDepthPitch is based on GL_UNPACK_IMAGE_HEIGHT which can be smaller -than the image height. - -Bug: chromium:466192044 -Change-Id: Idb07fb861a74e36576c0fed4a31e04fe58d1bd1d -Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7232774 -Reviewed-by: Kenneth Russell -Commit-Queue: Kenneth Russell - -diff --git a/src/libANGLE/renderer/metal/TextureMtl.mm b/src/libANGLE/renderer/metal/TextureMtl.mm -index 5a1fc9091c3af273c0bb4764fb98c09aadce9e58..9301862a49a4cd42db567aa427cfb631d668fe88 100644 ---- a/src/libANGLE/renderer/metal/TextureMtl.mm -+++ b/src/libANGLE/renderer/metal/TextureMtl.mm -@@ -2347,9 +2347,9 @@ uint32_t height(GLuint glLevel) const - { - // Current command buffer implementation does not support 64-bit offsets. - ANGLE_CHECK_GL_MATH(contextMtl, offset <= std::numeric_limits::max()); -+ size_t imageSize = pixelsRowPitch * mtlArea.size.height; - mtl::BufferRef stagingBuffer; -- ANGLE_TRY( -- mtl::Buffer::MakeBuffer(contextMtl, pixelsDepthPitch, nullptr, &stagingBuffer)); -+ ANGLE_TRY(mtl::Buffer::MakeBuffer(contextMtl, imageSize, nullptr, &stagingBuffer)); - - ASSERT(pixelsAngleFormat.pixelBytes == 4 && offset % 4 == 0); - ANGLE_TRY(SaturateDepth(contextMtl, sourceBuffer, stagingBuffer, -@@ -2360,11 +2360,13 @@ uint32_t height(GLuint glLevel) const - offset = 0; - } - -+ size_t srcBytesPerImage = mtlArea.size.depth > 1 ? pixelsDepthPitch : 0; -+ - // Use blit encoder to copy - mtl::BlitCommandEncoder *blitEncoder = GetBlitCommandEncoderForResources( - contextMtl, {sourceBuffer.get(), imageDef.image.get()}); - CopyBufferToOriginalTextureIfDstIsAView( -- contextMtl, blitEncoder, sourceBuffer, offset, pixelsRowPitch, pixelsDepthPitch, -+ contextMtl, blitEncoder, sourceBuffer, offset, pixelsRowPitch, srcBytesPerImage, - mtlArea.size, imageDef.image, slice, mtl::kZeroNativeMipLevel, mtlArea.origin, - imageFormat.isPVRTC() ? MTLBlitOptionRowLinearPVRTC : MTLBlitOptionNone); - } -diff --git a/src/tests/gl_tests/PackUnpackTest.cpp b/src/tests/gl_tests/PackUnpackTest.cpp -index e0664e75414ca117a48c4f0ba528d558f8ae3643..b34816ba724f1db718ea6a96512915259e063e72 100644 ---- a/src/tests/gl_tests/PackUnpackTest.cpp -+++ b/src/tests/gl_tests/PackUnpackTest.cpp -@@ -8,6 +8,7 @@ - // - - #include "test_utils/ANGLETest.h" -+#include "test_utils/gl_raii.h" - - using namespace angle; - -@@ -236,6 +237,32 @@ TEST_P(PackUnpackTest, PackUnpackSnormOverflow) - compareBeforeAfter(mSNormProgram, 16384.0f, -16384.0f, 1.0f, -1.0f); - } - -+// Test that the SaturateDepth pass in Metal uses the correct buffer size when the unpack image -+// height is smaller than the image height. -+TEST_P(PackUnpackTest, D32FSaturateDepth) -+{ -+ glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, 128); -+ ASSERT_GL_NO_ERROR(); -+ -+ std::vector kInitData(1024, 0); -+ -+ GLBuffer unpackBuffer; -+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, unpackBuffer); -+ glBufferData(GL_PIXEL_UNPACK_BUFFER, sizeof(float) * kInitData.size(), kInitData.data(), -+ GL_STATIC_DRAW); -+ -+ GLTexture tex; -+ glBindTexture(GL_TEXTURE_2D, tex); -+ glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, 1, 512, 0, GL_DEPTH_COMPONENT, GL_FLOAT, -+ 0); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -+ -+ ANGLE_GL_PROGRAM(drawTexture, essl1_shaders::vs::Texture2D(), essl1_shaders::fs::Texture2D()); -+ drawQuad(drawTexture, essl1_shaders::PositionAttrib(), 0.5f); -+ ASSERT_GL_NO_ERROR(); -+} -+ - GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PackUnpackTest); - ANGLE_INSTANTIATE_TEST_ES3(PackUnpackTest); - } // namespace diff --git a/patches/chromium/add_didinstallconditionalfeatures.patch b/patches/chromium/add_didinstallconditionalfeatures.patch index 493a4855fd..84520442a4 100644 --- a/patches/chromium/add_didinstallconditionalfeatures.patch +++ b/patches/chromium/add_didinstallconditionalfeatures.patch @@ -23,10 +23,10 @@ index 5196f155cdc641b66c4faa77d8b00097145a1290..bbfac47a74f989482343c222b78f187b int32_t world_id) {} virtual void DidClearWindowObject() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index e85e02e0f266836b23c5b2742414e6b15f581d1e..609c83fb3e7c9b5e4e5d06071d46b5be835b5ecd 100644 +index 7cba9e44b02cd5800fadc62b09453a1c42d237d4..ef01e2b13e58919f3b285a1b0e7702dfae78c395 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4661,6 +4661,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, +@@ -4714,6 +4714,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local context, observer.DidCreateScriptContext(context, world_id); } diff --git a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch index 4db3263030..b9ac805c65 100644 --- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch +++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch @@ -116,7 +116,7 @@ index 932658273154ef2e022358e493a8e7c00c86e732..57bbfb5cde62c9496c351c861880a189 // Visibility ----------------------------------------------------------- diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index d00a6ed9668b1454f7c4a659db1e799d84ad8a02..a450cc77ddf340e2b1813cf952ea4ab9c6c6602e 100644 +index 05de505006f17c1638710c1b109134eabd488b10..6bb88a68c14297f3c506220c9714a826248ea925 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -2507,6 +2507,10 @@ void WebViewImpl::SetPageLifecycleStateInternal( diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index 6ce11ea27a..b5151a33ac 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -33,10 +33,10 @@ index 606b3bd43179a5b4179a6ec9f58e531d55c1acb5..4d503a53290b4deaea016bb6867f3c07 "//base", "//build:branding_buildflags", diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index f3ca4ae1f2318b9196fb8ad473dd180d05635a90..ca45a7b0597a9642fbda53af27177222c6f35058 100644 +index 1bc112f86e95410a97c8600fa32c0b61e81f2722..563bfe0bd5d2fef7a6525ec69d9e8bd11ac55150 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4844,7 +4844,7 @@ static_library("browser") { +@@ -4852,7 +4852,7 @@ static_library("browser") { ] } @@ -46,10 +46,10 @@ index f3ca4ae1f2318b9196fb8ad473dd180d05635a90..ca45a7b0597a9642fbda53af27177222 # than here in :chrome_dll. deps += [ "//chrome:packed_resources_integrity_header" ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 8546d307ab57a9b999443761ce16cbdd41606bb7..950b6112e0c364a4cce322e6df7232c72a1056b7 100644 +index 614eaf59e32bca0d6e80b30c61d5a6cfd9c9ab4e..900625618717d6fac569428bb5c4667743081e49 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -7599,9 +7599,12 @@ test("unit_tests") { +@@ -7600,9 +7600,12 @@ test("unit_tests") { "//chrome/notification_helper", ] @@ -63,7 +63,7 @@ index 8546d307ab57a9b999443761ce16cbdd41606bb7..950b6112e0c364a4cce322e6df7232c7 "//chrome//services/util_win:unit_tests", "//chrome/app:chrome_dll_resources", "//chrome/app:win_unit_tests", -@@ -8558,6 +8561,10 @@ test("unit_tests") { +@@ -8559,6 +8562,10 @@ test("unit_tests") { "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc", ] @@ -74,7 +74,7 @@ index 8546d307ab57a9b999443761ce16cbdd41606bb7..950b6112e0c364a4cce322e6df7232c7 sources += [ # The importer code is not used on Android. "../common/importer/firefox_importer_utils_unittest.cc", -@@ -8614,7 +8621,6 @@ test("unit_tests") { +@@ -8615,7 +8622,6 @@ test("unit_tests") { # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above? deps += [ "../browser/screen_ai:screen_ai_install_state", diff --git a/patches/chromium/can_create_window.patch b/patches/chromium/can_create_window.patch index fb892c65f7..bf91370aed 100644 --- a/patches/chromium/can_create_window.patch +++ b/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 a2f54729cbfb4b11b960ea470ed9b9a774a4a75e..6f9982bc93444f1d417be59ab85eb48db54a19ab 100644 +index edaf9a7b2efc5ed7f4e946d720de54d5001f44d4..7d27b076c1947d2cd08364f87286ed6d9f460cdc 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -9863,6 +9863,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9867,6 +9867,7 @@ void RenderFrameHostImpl::CreateNewWindow( last_committed_origin_, params->window_container_type, params->target_url, params->referrer.To(), params->frame_name, params->disposition, *params->features, @@ -170,10 +170,10 @@ index 0e2ce90fd9c4a4c4aba0caacf026aa7a42c82f3a..d1f16f9c48bb2c60094f4644a9c41526 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 5924b040292f3542ae3dd5bc60561024423d02c3..e85e02e0f266836b23c5b2742414e6b15f581d1e 100644 +index 2a4b9b2a535f2b8d563e57b8a4325086ffe32ad3..7cba9e44b02cd5800fadc62b09453a1c42d237d4 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -6726,6 +6726,10 @@ WebView* RenderFrameImpl::CreateNewWindow( +@@ -6779,6 +6779,10 @@ WebView* RenderFrameImpl::CreateNewWindow( request.HasUserGesture(), GetWebFrame()->IsAdFrame(), GetWebFrame()->IsAdScriptInStack()); diff --git a/patches/chromium/chore_add_electron_deps_to_gitignores.patch b/patches/chromium/chore_add_electron_deps_to_gitignores.patch index 3541b61870..e18c3badda 100644 --- a/patches/chromium/chore_add_electron_deps_to_gitignores.patch +++ b/patches/chromium/chore_add_electron_deps_to_gitignores.patch @@ -6,10 +6,10 @@ Subject: chore: add electron deps to gitignores Makes things like "git status" quicker when developing electron locally diff --git a/.gitignore b/.gitignore -index e3b01b0a2b878681a861f76cb10f5b40bbc29a3d..277b05e37dadfd32fbcbbe1e596508aafd4313ba 100644 +index 14c35adad3781edfa32ab459920d6b6bfee4f0ae..b55ff334f250f61e201f6952f5f68d8dbe7ee37f 100644 --- a/.gitignore +++ b/.gitignore -@@ -228,6 +228,7 @@ vs-chromium-project.txt +@@ -229,6 +229,7 @@ vs-chromium-project.txt /data /delegate_execute /device/serial/device_serial_mojo.xml diff --git a/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch b/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch index ffe567d8a6..89c65e35ea 100644 --- a/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch +++ b/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch @@ -34,10 +34,10 @@ index bbfac47a74f989482343c222b78f187b70297e4e..3677ca3345fbc775d139684a12fe3624 virtual void DidClearWindowObject() {} virtual void DidChangeScrollOffset() {} diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 609c83fb3e7c9b5e4e5d06071d46b5be835b5ecd..bc293d31e9c13089238a0efa8421e76bf2d42ed4 100644 +index ef01e2b13e58919f3b285a1b0e7702dfae78c395..9fefff1cc3b0ea39fbef11c1b5f6d7d0e2f93693 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4667,10 +4667,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures( +@@ -4720,10 +4720,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures( observer.DidInstallConditionalFeatures(context, world_id); } diff --git a/patches/chromium/disable_hidden.patch b/patches/chromium/disable_hidden.patch index 51ecd638e0..4606858c8d 100644 --- a/patches/chromium/disable_hidden.patch +++ b/patches/chromium/disable_hidden.patch @@ -6,10 +6,10 @@ Subject: disable_hidden.patch Electron uses this to disable background throttling for hidden windows. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 3f70e5c18349575414aae38e2c1c9caf4a494594..081e2ceb505e4bb8104912df139f1f1deefe13d7 100644 +index 2e6bc4e6c3d9c2a027b192bbbaf91127e6268ed2..263f2b0d13dc914dac18d4f208f7ab338c68cc9b 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -841,6 +841,10 @@ void RenderWidgetHostImpl::WasHidden() { +@@ -847,6 +847,10 @@ void RenderWidgetHostImpl::WasHidden() { return; } @@ -21,10 +21,10 @@ index 3f70e5c18349575414aae38e2c1c9caf4a494594..081e2ceb505e4bb8104912df139f1f1d // Prompts should remain open and functional across tab switches. if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) { diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h -index 848a6661dabb64c4eed3bf1d23e1de730918e05f..437e1aadf8d2583050a622b28c391715c131d32a 100644 +index 1a4440adbcaa576022fc8501342e9fa70447f820..b523351ce3b8a618a8d4d13394496a20fe78f690 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h -@@ -1032,6 +1032,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl +@@ -1037,6 +1037,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl return synthetic_gesture_controller_.get(); } diff --git a/patches/chromium/extend_apply_webpreferences.patch b/patches/chromium/extend_apply_webpreferences.patch index f19b239c69..f0ccb12dab 100644 --- a/patches/chromium/extend_apply_webpreferences.patch +++ b/patches/chromium/extend_apply_webpreferences.patch @@ -15,7 +15,7 @@ Ideally we could add an embedder observer pattern here but that can be done in future work. diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc -index a450cc77ddf340e2b1813cf952ea4ab9c6c6602e..3d6667676e2ca130b226a46ac6df501b96712013 100644 +index 6bb88a68c14297f3c506220c9714a826248ea925..ea0c1b2d7fa82a4022793945d7408b30c977a91b 100644 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc @@ -1895,6 +1895,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, diff --git a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch index 3afef3aaea..601a8e04c1 100644 --- a/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch +++ b/patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch @@ -28,10 +28,10 @@ The patch should be removed in favor of either: Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397. diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 83c47152aae8652f7ffdb2fe9e79a737056854e5..ad876ab93a0a9765d018c9e5cfda1791d4901c13 100644 +index 9b3aec74c61e99b4e1ae77f3d54f73eecd482e73..56294f1caf7079f8718b94f83f4edb8e61485fbd 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -11464,6 +11464,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { +@@ -11504,6 +11504,11 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() { target_rph_id); } diff --git a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch index 94a8efa68e..d323165048 100644 --- a/patches/chromium/fix_restore_original_resize_performance_on_macos.patch +++ b/patches/chromium/fix_restore_original_resize_performance_on_macos.patch @@ -11,10 +11,10 @@ This patch should be upstreamed as a conditional revert of the logic in desktop vs mobile runtimes. i.e. restore the old logic only on desktop platforms diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 5c68b5609ce7a1d6d5c21690e9c6aee2f685eade..a7309941d904b9ab32ff101dfd26be7e09fed1ac 100644 +index d56dbfe18bf24976e970531bd6d973b46a1b61e7..1c239a617aa3714b0a0d054056403c1e67186baa 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -2156,9 +2156,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { +@@ -2162,9 +2162,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() { void RenderWidgetHostImpl::NotifyScreenInfoChanged() { // The resize message (which may not happen immediately) will carry with it // the screen info as well as the new size (if the screen has changed scale diff --git a/patches/chromium/frame_host_manager.patch b/patches/chromium/frame_host_manager.patch index 9d56ca3265..d5c49c4a72 100644 --- a/patches/chromium/frame_host_manager.patch +++ b/patches/chromium/frame_host_manager.patch @@ -6,10 +6,10 @@ Subject: frame_host_manager.patch Allows embedder to intercept site instances created by chromium. diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc -index 9201f3a63e19f0c404a422dc3e6dbf8ac08627a0..833c00abebdc4a191ff0b684481c387162c0b697 100644 +index 449badcfb1aa677883fd9732c747ef590aeeaecd..de49ceb990db1fa91ad02238a0b48fd763f734e4 100644 --- a/content/browser/renderer_host/render_frame_host_manager.cc +++ b/content/browser/renderer_host/render_frame_host_manager.cc -@@ -4842,6 +4842,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( +@@ -4845,6 +4845,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( request->ResetStateForSiteInstanceChange(); } diff --git a/patches/chromium/gritsettings_resource_ids.patch b/patches/chromium/gritsettings_resource_ids.patch index 5991744557..51aca45463 100644 --- a/patches/chromium/gritsettings_resource_ids.patch +++ b/patches/chromium/gritsettings_resource_ids.patch @@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch Add electron resources file to the list of resource ids generation. diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index ee45675b7b852eb79ef112f6c564d39d9abfd5ba..8a7fc57f0675ea35845bb78bf689659abca5671e 100644 +index aaf7050604d4968c8eb1b9a42decdadfec527e20..edf5090f0a30c888efcfe750a66a7f5082a84df4 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -1629,6 +1629,11 @@ diff --git a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch index 4ed61a4269..d63d3011e6 100644 --- a/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch +++ b/patches/chromium/mas_avoid_private_macos_api_usage.patch.patch @@ -547,7 +547,7 @@ index 010c713090e5038dc90db131c8f621422d30c03b..20c35e887a0496ee609c077e3b0494bd void ForwardKeyboardEvent(const input::NativeWebKeyboardEvent& key_event, diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index 3094700368d25688be9e0fdfcd08f3f3345e7df9..eba89abb54098e14a00fbbf35eba9581d29b8062 100644 +index e11f8c537f193c776b735ff62a7d0b9c92984c0e..580a2b96bae1c2701b9ff146004ad250176bc330 100644 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm @@ -34,6 +34,7 @@ @@ -558,7 +558,7 @@ index 3094700368d25688be9e0fdfcd08f3f3345e7df9..eba89abb54098e14a00fbbf35eba9581 #include "skia/ext/skia_utils_mac.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/input/input_handler.mojom.h" -@@ -2089,15 +2090,21 @@ - (NSAccessibilityRole)accessibilityRole { +@@ -2100,15 +2101,21 @@ - (NSAccessibilityRole)accessibilityRole { // Since this implementation doesn't have to wait any IPC calls, this doesn't // make any key-typing jank. --hbono 7/23/09 // @@ -581,7 +581,7 @@ index 3094700368d25688be9e0fdfcd08f3f3345e7df9..eba89abb54098e14a00fbbf35eba9581 return kAttributes; } diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index 8ac2508c0fc0102a7011870313b95f80f02b54ad..01b30acf7d98ed925a8285d94837894c916f7651 100644 +index e1a23a7d1090390e2ab418b62cf4d820e25ebc2d..8d3c63e9c4da3fa0a804a62891c8da608a572165 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -342,6 +342,7 @@ source_set("browser") { @@ -796,7 +796,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe } // namespace content diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn -index 47462e3912051b2b428ecc63fb69b178293abf8f..e8c54bad69b38a341372d4d06c87004d6467ba14 100644 +index 2bab0bd80ffb72e3a25af8b9eab84cf55764e221..ab3bcecccb126e12c9a000eaea4ce21d59157c4f 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -701,6 +701,7 @@ static_library("test_support") { @@ -816,7 +816,7 @@ index 47462e3912051b2b428ecc63fb69b178293abf8f..e8c54bad69b38a341372d4d06c87004d } mojom("content_test_mojo_bindings") { -@@ -2063,6 +2066,7 @@ test("content_browsertests") { +@@ -2064,6 +2067,7 @@ test("content_browsertests") { "//ui/shell_dialogs", "//ui/snapshot", "//ui/webui:test_support", @@ -824,7 +824,7 @@ index 47462e3912051b2b428ecc63fb69b178293abf8f..e8c54bad69b38a341372d4d06c87004d ] if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) { -@@ -3403,6 +3407,7 @@ test("content_unittests") { +@@ -3404,6 +3408,7 @@ test("content_unittests") { "//ui/shell_dialogs", "//ui/webui:test_support", "//url", diff --git a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch index 1ae35ff24e..25a935c4a6 100644 --- a/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch +++ b/patches/chromium/port_autofill_colors_to_the_color_pipeline.patch @@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them. This patch can be our autofill implementation to work like Chromium's. diff --git a/ui/color/color_id.h b/ui/color/color_id.h -index e340ccdfb4c364774679c1b68df4b1340286d41a..72ebf04033e4ec67acb26780d4f252fc0b1d9917 100644 +index 48a156ca2d4732cf1296e507de9f13dd3364128b..e31fa0b7e408bdad61bb9a1af7f56c4018d0d09b 100644 --- a/ui/color/color_id.h +++ b/ui/color/color_id.h -@@ -431,6 +431,10 @@ +@@ -436,6 +436,10 @@ E_CPONLY(kColorRadioButtonForegroundUnchecked) \ E_CPONLY(kColorRadioButtonForegroundDisabled) \ E_CPONLY(kColorRadioButtonForegroundChecked) \ @@ -22,7 +22,7 @@ index e340ccdfb4c364774679c1b68df4b1340286d41a..72ebf04033e4ec67acb26780d4f252fc E_CPONLY(kColorSegmentedButtonBorder) \ E_CPONLY(kColorSegmentedButtonFocus) \ E_CPONLY(kColorSegmentedButtonForegroundChecked) \ -@@ -539,6 +543,7 @@ +@@ -544,6 +548,7 @@ E_CPONLY(kColorTreeNodeForeground) \ E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \ E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \ diff --git a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch index 7a060a5daf..eb15421299 100644 --- a/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch +++ b/patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch @@ -30,10 +30,10 @@ index 9a4195a3e53353342c75d6c4372ed4c27ef13fd3..bc1bfa1ac381ec94121a264d9dcbae9e // RenderWidgetHost on the primary main frame, and false otherwise. virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*); diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index 081e2ceb505e4bb8104912df139f1f1deefe13d7..5c68b5609ce7a1d6d5c21690e9c6aee2f685eade 100644 +index 263f2b0d13dc914dac18d4f208f7ab338c68cc9b..d56dbfe18bf24976e970531bd6d973b46a1b61e7 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -2075,6 +2075,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { +@@ -2081,6 +2081,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) { if (view_) { view_->UpdateCursor(cursor); } diff --git a/patches/chromium/render_widget_host_view_mac.patch b/patches/chromium/render_widget_host_view_mac.patch index 9cecf7338e..54b27f8087 100644 --- a/patches/chromium/render_widget_host_view_mac.patch +++ b/patches/chromium/render_widget_host_view_mac.patch @@ -8,7 +8,7 @@ respond to the first mouse click in their window, which is desirable for some kinds of utility windows. Similarly for `disableAutoHideCursor`. diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index f47f40986dc605ec1dbfa811d94851dcfa6912b1..3094700368d25688be9e0fdfcd08f3f3345e7df9 100644 +index 4b9bdb8e9e9ca116703461fa0917673acec144cf..e11f8c537f193c776b735ff62a7d0b9c92984c0e 100644 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm @@ -167,6 +167,15 @@ void ExtractUnderlines(NSAttributedString* string, @@ -38,7 +38,7 @@ index f47f40986dc605ec1dbfa811d94851dcfa6912b1..3094700368d25688be9e0fdfcd08f3f3 // Enable "click-through" if mouse clicks are accepted in inactive windows. return [self acceptsMouseEventsOption] > AcceptMouseEvents::kWhenInActiveWindow; -@@ -933,6 +946,8 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent { +@@ -944,6 +957,8 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent { // its parent view. BOOL hitSelf = NO; while (view) { @@ -47,7 +47,7 @@ index f47f40986dc605ec1dbfa811d94851dcfa6912b1..3094700368d25688be9e0fdfcd08f3f3 if (view == self) hitSelf = YES; if ([view isKindOfClass:[self class]] && ![view isEqual:self] && -@@ -1267,6 +1282,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { +@@ -1278,6 +1293,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { eventType == NSEventTypeKeyDown && !(modifierFlags & NSEventModifierFlagCommand); diff --git a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch index a962b0d253..02b526f8fd 100644 --- a/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch +++ b/patches/chromium/revert_code_health_clean_up_stale_macwebcontentsocclusion.patch @@ -254,10 +254,10 @@ index 17d6d7d935f93afefa9123f56ef9c138c3070f93..8dfa7501a6a2998e107bf9b51f5e5c3d } diff --git a/content/common/features.cc b/content/common/features.cc -index f665b6af073a94bd4916a8c14cd2281ab7a07a32..9e4c24c14718384195ec7352701ee86f80e27aae 100644 +index db5666a83944f7fa5bbc96e6eefbfcac4a580bbc..7a433bb9dc622a8d21c13f0ad4ec6d31959d20cd 100644 --- a/content/common/features.cc +++ b/content/common/features.cc -@@ -356,6 +356,14 @@ BASE_FEATURE(kInterestGroupUpdateIfOlderThan, base::FEATURE_ENABLED_BY_DEFAULT); +@@ -361,6 +361,14 @@ BASE_FEATURE(kInterestGroupUpdateIfOlderThan, base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kIOSurfaceCapturer, base::FEATURE_ENABLED_BY_DEFAULT); #endif @@ -273,10 +273,10 @@ index f665b6af073a94bd4916a8c14cd2281ab7a07a32..9e4c24c14718384195ec7352701ee86f BASE_FEATURE(kKeepChildProcessAfterIPCReset, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/content/common/features.h b/content/common/features.h -index 7fabf5fffd89fe321f9ba98682650258f03ccec0..c047f8300352455b354432d23a0bbee6a503adaa 100644 +index 4d82e9a08cfc9987061284716db0670216d04445..462e0da350ef7cc32751000f28450ee7b9cb049c 100644 --- a/content/common/features.h +++ b/content/common/features.h -@@ -136,6 +136,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInterestGroupUpdateIfOlderThan); +@@ -137,6 +137,9 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kInitialWebUISyncNavStartToCommit); #if BUILDFLAG(IS_MAC) CONTENT_EXPORT BASE_DECLARE_FEATURE(kIOSurfaceCapturer); #endif diff --git a/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch b/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch index 8ec9e479c8..20d9985131 100644 --- a/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch +++ b/patches/chromium/revert_partial_remove_unused_prehandlemouseevent.patch @@ -39,10 +39,10 @@ index bc1bfa1ac381ec94121a264d9dcbae9e02ab5a81..c6fc03ae158b3ce87fd684d765a3f1b0 // event before sending it to the renderer. See enum for details on return // value. diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc -index a7309941d904b9ab32ff101dfd26be7e09fed1ac..d8c715ade23f078aa2efacc59a97f0f4a8b62312 100644 +index 1c239a617aa3714b0a0d054056403c1e67186baa..72e52e5c1c3c2fd90e73e434283d92697b4030d8 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc -@@ -1589,6 +1589,10 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo( +@@ -1595,6 +1595,10 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo( CHECK_GE(mouse_event.GetType(), WebInputEvent::Type::kMouseTypeFirst); CHECK_LE(mouse_event.GetType(), WebInputEvent::Type::kMouseTypeLast); diff --git a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch index e20bc7b77c..077d5066ac 100644 --- a/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch +++ b/patches/chromium/revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch @@ -10,10 +10,10 @@ on Windows. We should refactor our code so that this patch isn't necessary. diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json -index 0d6c0b495cae4f3f62a46a495cec093e2ce92959..e795ed2155b0bb2d7ba8329190416df31920f824 100644 +index d326724f7c20983cfe9ec268444028eadd571f71..346eba0c5c5b8e6ffc61a2b00586158b78134c43 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json -@@ -25763,6 +25763,21 @@ +@@ -25873,6 +25873,21 @@ ] } ], diff --git a/patches/chromium/webview_fullscreen.patch b/patches/chromium/webview_fullscreen.patch index f94364315c..5481df2372 100644 --- a/patches/chromium/webview_fullscreen.patch +++ b/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 6f9982bc93444f1d417be59ab85eb48db54a19ab..9cff0939ff75aec57be14e8214600a7fb47a713a 100644 +index 7d27b076c1947d2cd08364f87286ed6d9f460cdc..55d1609ba46abe9433d22a894fc2b498735ff778 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -8969,6 +8969,17 @@ void RenderFrameHostImpl::EnterFullscreen( +@@ -8973,6 +8973,17 @@ void RenderFrameHostImpl::EnterFullscreen( } } diff --git a/patches/config.json b/patches/config.json index 0f73a4bc47..8d297c0fd3 100644 --- a/patches/config.json +++ b/patches/config.json @@ -1,6 +1,5 @@ [ { "patch_dir": "src/electron/patches/chromium", "repo": "src" }, - { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }, { "patch_dir": "src/electron/patches/boringssl", "repo": "src/third_party/boringssl/src" }, { "patch_dir": "src/electron/patches/devtools_frontend", "repo": "src/third_party/devtools-frontend/src" }, { "patch_dir": "src/electron/patches/ffmpeg", "repo": "src/third_party/ffmpeg" }, diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 0b748897ce..0a7d2324ef 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -3881,7 +3881,8 @@ void WebContents::PDFReadyToPrint() { } void WebContents::OnInputEvent(const content::RenderWidgetHost& rfh, - const blink::WebInputEvent& event) { + const blink::WebInputEvent& event, + input::InputEventSource source) { Emit("input-event", event); } diff --git a/shell/browser/api/electron_api_web_contents.h b/shell/browser/api/electron_api_web_contents.h index 5fbdcd49db..954f8988c4 100644 --- a/shell/browser/api/electron_api_web_contents.h +++ b/shell/browser/api/electron_api_web_contents.h @@ -432,7 +432,8 @@ class WebContents final : public ExclusiveAccessContext, // content::RenderWidgetHost::InputEventObserver: void OnInputEvent(const content::RenderWidgetHost& rfh, - const blink::WebInputEvent& event) override; + const blink::WebInputEvent& event, + input::InputEventSource source) override; // content::JavaScriptDialogManager: void RunJavaScriptDialog(content::WebContents* web_contents, diff --git a/spec/chromium-spec.ts b/spec/chromium-spec.ts index 4b4cdc23eb..ec7e721e95 100644 --- a/spec/chromium-spec.ts +++ b/spec/chromium-spec.ts @@ -92,9 +92,9 @@ describe('window.postMessage', () => { w.loadURL(`file://${fixturesPath}/pages/window-open-postMessage-driver.html`); const [, message] = await once(ipcMain, 'complete'); expect(message.data).to.equal('testing'); - expect(message.origin).to.equal('file://'); + expect(message.origin).to.equal('null'); expect(message.sourceEqualsOpener).to.equal(true); - expect(message.eventOrigin).to.equal('file://'); + expect(message.eventOrigin).to.equal('null'); }); }); @@ -1870,7 +1870,7 @@ describe('chromium features', () => { `); expect(sourceIsChild).to.be.true(); - expect(origin).to.equal('file://'); + expect(origin).to.equal('null'); }); it('supports windows opened from a ', async () => {