mirrors/electron
0
0 Fork 0
mirror of https://github.com/electron/electron.git synced 2026-10-28 11:44:46 +08:00
Code Activity

chore: bump chromium to 158.0.8125.0 (main) (#55311)

Browse Source 
* chore: bump chromium in DEPS to 158.0.8121.0

* 8561777: [device] Make DeviceMonitorMessageWindow a NoDestructor

Upstreamed; remove the patch.

Ref: https://chromium-review.googlesource.com/c/chromium/src/+/8561777

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* chore: update patches

* chore: bump chromium in DEPS to 158.0.8123.0

* chore: update patches

* chore: bump chromium in DEPS to 158.0.8125.0

* chore: update patches

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: electron-claude[bot] <279139701+electron-claude[bot]@users.noreply.github.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
electron-roller[bot]Claude Fable 5.1electron-claude[bot]
 authored and GitHub committed 2026-10-26 12:22:45 -07:00
1 parent baf7eaf5b4
commit ece4214c22
37 files changed
+145 -437
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

DEPS
+1 -1
View File
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
vars = {
'chromium_version':
'158.0.8120.0',
'158.0.8125.0',
'node_version':
'v24.22.1',
'nan_version':
patches/chromium/.patches
-1
View File
@@ -137,7 +137,6 @@ fix_gate_webstoreprivate_on_a_delegated_availability_check.patch
build_drop_the_unused_chrome_browser_win_dep_from_color_mixers.patch
fix_plumb_the_requesting_frame_through_pointer_lock_requests.patch
feat_let_the_host_of_a_remote_nswindow_set_more_of_its_behavior.patch
device_make_devicemonitormessagewindow_a_nodestructor.patch
fix_handle_a_null_pending_call_in_dbus_objectproxy.patch
feat_update_executioncontext_api.patch
use_forward_slashes_for_the_default_crdtp_include_dir_in_templates.patch
patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+1 -1
View File
@@ -51,7 +51,7 @@ index d98b5dda96208e3f923aa8a9c6e6eb988004904b..7c91ed2d7a397ad9e36cbecfc13de7bd
void SendRendererPreferencesToRenderer(
const blink::RendererPreferences& preferences);
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 56f2629d87ac241199599f4f4fa3b32f9307da5f..8339aff54788d987cbd2b8c42172e699dbac6478 100644
index 510c5ca0c4a9a7f5e7386578ab2febcd50424ade..f911072ec8be3b7dd01b1a64fa92e22394d03f69 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -709,8 +709,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
patches/chromium/can_create_window.patch
+7 -7
View File
@@ -12,10 +12,10 @@ that the new window is created in its own BrowsingInstance (and process).
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 f3b309d863130b88c200257bcadbfce5660449fa..f2e64e5569741000552218689ae5edf1f1d63791 100644
index 13ce537faeae2621ea89150af6a4584cf30c1d9d..d40577f4f1b90fb8c91711bc4852d08b05aace55 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10867,6 +10867,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10903,6 +10903,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,
@@ -23,7 +23,7 @@ index f3b309d863130b88c200257bcadbfce5660449fa..f2e64e5569741000552218689ae5edf1
effective_transient_activation_state, params->opener_suppressed,
&no_javascript_access);
@@ -10877,6 +10878,11 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -10913,6 +10914,11 @@ void RenderFrameHostImpl::CreateNewWindow(
return;
}
@@ -94,7 +94,7 @@ index 115c8589dd52daae3b3d0472bfb7c6113131c394..c1a08cef12a58935839bfa42f937b2ee
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 4e9dde914bf78d0a2a9d633ae05c5a853c1b4073..225a1e707b6b6b37210b04acba30404a567f20f1 100644
index 2a00f93180fb4d877ec8596603c060d15c71dc3c..ce067b55dfa7fc63de669984cb9c4776cc3f0f5f 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -842,6 +842,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -107,10 +107,10 @@ index 4e9dde914bf78d0a2a9d633ae05c5a853c1b4073..225a1e707b6b6b37210b04acba30404a
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 9fc5fa3ce4121e8eb784c7e62fc0321b509788dd..3bdab819749ab7e693ad40852645dce700e701eb 100644
index b9a2b7cc0655a569a8e4e2835f5846257f509706..95c7ac3c7f7aca3c283b22a2a5cf6f1b0479ea3f 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -206,6 +206,7 @@ class TrustedURLLoaderHeaderClient;
@@ -207,6 +207,7 @@ class TrustedURLLoaderHeaderClient;
class URLResponseHead;
} // namespace mojom
struct ResourceRequest;
@@ -118,7 +118,7 @@ index 9fc5fa3ce4121e8eb784c7e62fc0321b509788dd..3bdab819749ab7e693ad40852645dce7
} // namespace network
namespace sandbox {
@@ -1302,6 +1303,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1303,6 +1304,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
patches/chromium/chore_introduce_blocking_api_for_electron.patch
+1 -1
View File
@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
of explicitly adding ScopedAllowBlocking calls as friends.
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index 5f96a065e9b68bfed8925be3bda69bf3365f6f22..8673b389ff500e53df52124284b0f7f67ad8a709 100644
index 95bafac63e471e57579c8296f16bd34bf547c839..fe097c7d4297e2f73add43430296a8502f0e2043 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -133,6 +133,7 @@ class KeyStorageLinux;
patches/chromium/chore_modify_chromium_handling_of_mouse_events.patch
+2 -2
View File
@@ -34,10 +34,10 @@ index cc3f9bc9383f8272a5cd95b1f2ac56529d86e493..5ca29b84cdaf42ef516ef819ae32b230
class ScrollEvent;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 281ffd8c522aa5e5906455db562aa88dd5c91d9b..0f0b0853410ec111f7fde3b991681bcf4046af8b 100644
index b566443b3834bcd1a24791a629ff2f9651eca266..f74309d3c0d9c474e1dff275d9ef263562922d44 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -1584,6 +1584,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() {
@@ -1604,6 +1604,10 @@ HBRUSH DesktopWindowTreeHostWin::GetBackgroundPaintBrush() {
return background_paint_brush_;
}
patches/chromium/chore_patch_out_partition_attribute_dcheck_for_webviews.patch
+1 -1
View File
@@ -14,7 +14,7 @@ This change patches it out to prevent the DCHECK.
It can be removed once/if we see a better solution to the problem.
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 96447a941ef3ed30d1595afffe633469988c108c..b5e39b890ace0da9aa33ef55f984deeba7fbf95d 100644
index 030dd24ac073921c9ebca6d66b8ffa8050d74c8d..954add84e16a7f0160f36475f97ef73537c12362 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -228,7 +228,7 @@ scoped_refptr<SiteInstanceImpl> SiteInstanceImpl::CreateForGuest(
patches/chromium/device_make_devicemonitormessagewindow_a_nodestructor.patch
-291
View File
@@ -1,291 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <kleinschmidtorama@gmail.com>
Date: Thu, 22 Oct 2026 10:32:26 -0400
Subject: [device] Make DeviceMonitorMessageWindow a NoDestructor
DeviceMonitorMessageWindow, which owns the DeviceMonitorWin instances,
was deleted by an AtExitManager callback. Any observer still alive at
that point is left holding a dangling pointer to its monitor.
This happens to SerialDeviceEnumeratorWin::UiThreadHelper at browser
shutdown. DeviceService lives in the UI thread's SequenceLocalStorage,
so it is destroyed by BrowserTaskExecutor::Shutdown(), which runs after
BrowserMainLoop has shut down the ThreadPool. DeviceService holds the
SerialPortManagerImpl in a SequenceBound on a ThreadPool sequence, so
the task that would delete it (and the enumerator and helper it owns) is
dropped. The helper's ScopedObservation is still live when AtExitManager
deletes the monitor, which fails CheckDanglingRawPtrBufferEmpty() at
exit when dangling pointer checks are enabled.
The AtExit registration dates from when DeviceMonitorMessageWindow owned
its own message window and needed to be destroyed in order with an
AtExit-managed HidService. Neither is true anymore: it listens on
gfx::SingletonHwnd, which is itself a NoDestructor, and HidService is
owned by DeviceService. Make it a base::NoDestructor so the monitors
outlive all of their observers.
Bug: 572741653
Change-Id: I85aa5586edab522b6fde5c77a5e4515b848a886b
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/8561777.
This patch can be removed once that CL lands.
diff --git a/device/BUILD.gn b/device/BUILD.gn
index 2cdc91e243d010941a6878b26cb164125fc25dcb..741410776eb26868aef2b05d9a3aa042c02b5b0f 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -104,6 +104,7 @@ test("device_unittests") {
if (is_win) {
sources += [
+ "base/device_monitor_win_unittest.cc",
"bluetooth/bluetooth_adapter_win_unittest.cc",
"bluetooth/bluetooth_device_win_unittest.cc",
"bluetooth/bluetooth_service_record_win_unittest.cc",
diff --git a/device/base/device_monitor_win.cc b/device/base/device_monitor_win.cc
index 72073904d7805ffe60f6077736a548ff83cde78e..ff1858cb5476f116f0595d8cbb850431e2c418ce 100644
--- a/device/base/device_monitor_win.cc
+++ b/device/base/device_monitor_win.cc
@@ -13,13 +13,13 @@
#include <map>
#include <memory>
-#include "base/at_exit.h"
#include "base/callback_list.h"
#include "base/compiler_specific.h"
#include "base/containers/span.h"
#include "base/functional/bind.h"
-#include "base/functional/callback_helpers.h"
#include "base/logging.h"
+#include "base/no_destructor.h"
+#include "base/sequence_checker.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/current_thread.h"
@@ -27,12 +27,8 @@
namespace device {
-class DeviceMonitorMessageWindow;
-
namespace {
-DeviceMonitorMessageWindow* g_message_window;
-
// Provides basic comparability for GUIDs so that they can be used as keys to an
// STL map.
struct CompareGUID {
@@ -49,19 +45,19 @@ struct CompareGUID {
// for each unique GUID it sees.
class DeviceMonitorMessageWindow {
public:
+ // Returns nullptr if initialization fails. Initialization is retried on the
+ // next call, since it fails when called from a thread without a UI message
+ // pump.
static DeviceMonitorMessageWindow* GetInstance() {
- if (!g_message_window) {
- g_message_window = new DeviceMonitorMessageWindow();
- if (g_message_window->Init()) {
- base::AtExitManager::RegisterTask(
- base::BindOnce(&base::DeletePointer<DeviceMonitorMessageWindow>,
- base::Unretained(g_message_window)));
- } else {
- delete g_message_window;
- g_message_window = nullptr;
- }
+ // Never destroyed, like the gfx::SingletonHwnd it listens on, so that
+ // observers that outlive the AtExitManager are not left with dangling
+ // pointers to the DeviceMonitorWin instances it owns.
+ static base::NoDestructor<DeviceMonitorMessageWindow> instance;
+ DCHECK_CALLED_ON_VALID_SEQUENCE(instance->sequence_checker_);
+ if (!instance->initialized_) {
+ instance->initialized_ = instance->Init();
}
- return g_message_window;
+ return instance->initialized_ ? instance.get() : nullptr;
}
DeviceMonitorMessageWindow(const DeviceMonitorMessageWindow&) = delete;
@@ -69,6 +65,7 @@ class DeviceMonitorMessageWindow {
delete;
DeviceMonitorWin* GetForDeviceInterface(const GUID& device_interface) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
std::unique_ptr<DeviceMonitorWin>& device_monitor =
device_monitors_[device_interface];
if (!device_monitor) {
@@ -77,21 +74,20 @@ class DeviceMonitorMessageWindow {
return device_monitor.get();
}
- DeviceMonitorWin* GetForAllInterfaces() { return &all_device_monitor_; }
+ DeviceMonitorWin* GetForAllInterfaces() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ return &all_device_monitor_;
+ }
private:
- friend void base::DeletePointer<DeviceMonitorMessageWindow>(
- DeviceMonitorMessageWindow* message_window);
+ friend class base::NoDestructor<DeviceMonitorMessageWindow>;
- DeviceMonitorMessageWindow() {}
-
- ~DeviceMonitorMessageWindow() {
- if (notify_handle_) {
- UnregisterDeviceNotification(notify_handle_);
- }
- }
+ DeviceMonitorMessageWindow() = default;
+ ~DeviceMonitorMessageWindow() = delete;
bool Init() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+
// gfx::SingletonHwnd is a process-wide singleton which only creates its
// window if it is first instantiated on a thread running a UI message
// pump. Bail out before touching it so that a caller on the wrong thread
@@ -107,8 +103,7 @@ class DeviceMonitorMessageWindow {
return false;
}
- // base::Unretained() is safe because |subscription_| is owned by this
- // object and unregisters the callback when it is destroyed.
+ // base::Unretained() is safe because this object is never destroyed.
subscription_ =
gfx::SingletonHwnd::GetInstance()->RegisterCallback(base::BindRepeating(
&DeviceMonitorMessageWindow::OnWndProc, base::Unretained(this)));
@@ -120,6 +115,7 @@ class DeviceMonitorMessageWindow {
DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES);
if (!notify_handle_) {
PLOG(ERROR) << "Failed to register for device notifications";
+ subscription_ = {};
return false;
}
@@ -127,6 +123,7 @@ class DeviceMonitorMessageWindow {
}
void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
if (message != WM_DEVICECHANGE ||
(wparam != DBT_DEVICEARRIVAL && wparam != DBT_DEVICEREMOVECOMPLETE)) {
return;
@@ -168,6 +165,9 @@ class DeviceMonitorMessageWindow {
DeviceMonitorWin all_device_monitor_;
HDEVNOTIFY notify_handle_ = NULL;
base::CallbackListSubscription subscription_;
+ bool initialized_ = false;
+
+ SEQUENCE_CHECKER(sequence_checker_);
};
void DeviceMonitorWin::Observer::OnDeviceAdded(
@@ -202,10 +202,12 @@ DeviceMonitorWin* DeviceMonitorWin::GetForAllInterfaces() {
DeviceMonitorWin::~DeviceMonitorWin() {}
void DeviceMonitorWin::AddObserver(Observer* observer) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
observer_list_.AddObserver(observer);
}
void DeviceMonitorWin::RemoveObserver(Observer* observer) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
observer_list_.RemoveObserver(observer);
}
@@ -213,6 +215,7 @@ DeviceMonitorWin::DeviceMonitorWin() {}
void DeviceMonitorWin::NotifyDeviceAdded(const GUID& class_guid,
const std::wstring& device_path) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
for (auto& observer : observer_list_) {
observer.OnDeviceAdded(class_guid, device_path);
}
@@ -220,6 +223,7 @@ void DeviceMonitorWin::NotifyDeviceAdded(const GUID& class_guid,
void DeviceMonitorWin::NotifyDeviceRemoved(const GUID& class_guid,
const std::wstring& device_path) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
for (auto& observer : observer_list_) {
observer.OnDeviceRemoved(class_guid, device_path);
}
diff --git a/device/base/device_monitor_win.h b/device/base/device_monitor_win.h
index 0b1c2a4edd9cccc22cdd1b947b35f8e86adccb65..1ada9645dd940d49b5a19fc2699c79079fb5db82 100644
--- a/device/base/device_monitor_win.h
+++ b/device/base/device_monitor_win.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/observer_list.h"
+#include "base/sequence_checker.h"
#include "base/win/windows_types.h"
#include "device/base/device_base_export.h"
@@ -48,6 +49,10 @@ class DEVICE_BASE_EXPORT DeviceMonitorWin {
void NotifyDeviceRemoved(const GUID& class_guid,
const std::wstring& device_path);
+ // `observer_list_` is not thread-safe, so observers must be added and
+ // removed on the sequence that delivers notifications.
+ SEQUENCE_CHECKER(sequence_checker_);
+
base::ObserverList<Observer>::Unchecked observer_list_;
};
diff --git a/device/base/device_monitor_win_unittest.cc b/device/base/device_monitor_win_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fea61c4b0a98d31bcd1174425746076addd91ae5
--- /dev/null
+++ b/device/base/device_monitor_win_unittest.cc
@@ -0,0 +1,50 @@
+// Copyright 2026 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "device/base/device_monitor_win.h"
+
+#include "base/at_exit.h"
+#include "base/scoped_observation.h"
+#include "base/test/task_environment.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace device {
+
+namespace {
+
+class TestObserver : public DeviceMonitorWin::Observer {
+ public:
+ void Observe(DeviceMonitorWin* monitor) { observation_.Observe(monitor); }
+ void Reset() { observation_.Reset(); }
+
+ private:
+ base::ScopedObservation<DeviceMonitorWin, DeviceMonitorWin::Observer>
+ observation_{this};
+};
+
+} // namespace
+
+// Observers can outlive the AtExitManager (e.g. the serial enumerator's UI
+// thread helper, which is leaked at browser shutdown), so the monitors must
+// not be destroyed by it. If they were, `observer` would be left with a
+// dangling pointer to the monitor and would call RemoveObserver() on it after
+// it was freed.
+TEST(DeviceMonitorWinTest, MonitorOutlivesAtExitManager) {
+ base::test::SingleThreadTaskEnvironment task_environment(
+ base::test::SingleThreadTaskEnvironment::MainThreadType::UI);
+
+ TestObserver observer;
+ DeviceMonitorWin* monitor = nullptr;
+ {
+ base::ShadowingAtExitManager at_exit_manager;
+ monitor = DeviceMonitorWin::GetForAllInterfaces();
+ ASSERT_TRUE(monitor);
+ observer.Observe(monitor);
+ }
+
+ EXPECT_EQ(monitor, DeviceMonitorWin::GetForAllInterfaces());
+ observer.Reset();
+}
+
+} // namespace device
patches/chromium/disable_compositor_recycling.patch
+1 -1
View File
@@ -6,7 +6,7 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 23b8154e7695d2fb4efbd777de6e84f2ad5d614e..6fcaf8b7f3e43065382794a221c2ff8019e6ad2e 100644
index 082a7197c3f7d596371ce05554fe3beacdf3e1b6..d106417628b87c86fd9582a346ff7a1b96b12733 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -629,7 +629,11 @@ void SendVisibleTimeRequestToDelegatedFrameHost(
patches/chromium/disable_hidden.patch
+1 -1
View File
@@ -43,7 +43,7 @@ index 02bdef3bae5a29d874956d88e33e37bf0fd9ce5c..f3c132412ca87c3abda84cf91434a9f7
// |routing_id| must not be IPC::mojom::kRoutingIdNone.
// If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index cdd82d37e4938e5722b958aa0c21a3be066ed017..56f2629d87ac241199599f4f4fa3b32f9307da5f 100644
index 72949081c78e0cced496c1f32cdaf96223c2133d..510c5ca0c4a9a7f5e7386578ab2febcd50424ade 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -768,7 +768,7 @@ void RenderWidgetHostViewAura::HideImpl() {
patches/chromium/enable_reset_aspect_ratio.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 8e8693c9b0aaa243a34cd5b580bf862534880cbf..281ffd8c522aa5e5906455db562aa88dd5c91d9b 100644
index bc8e826e5e3fbab4b1ad7a9839c3a3878ec7691f..b566443b3834bcd1a24791a629ff2f9651eca266 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -745,7 +745,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -765,7 +765,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
void DesktopWindowTreeHostWin::SetAspectRatio(
const gfx::SizeF& aspect_ratio,
const gfx::Size& excluded_margin) {
patches/chromium/expose_setuseragent_on_networkcontext.patch
+6 -6
View File
@@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 559f8dad7946398798048cf32fae46556c787f3a..145a44dcdadf0ca3e8386da75d50cbc87534cbcb 100644
index 488552051cbe00ce6374581481f5fb3d4fedaa13..aa7ba786080fb4dd1587f7db9f213da131197308 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -2139,6 +2139,13 @@ void NetworkContext::SetNetworkConditions(
@@ -2141,6 +2141,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@@ -51,10 +51,10 @@ index 559f8dad7946398798048cf32fae46556c787f3a..145a44dcdadf0ca3e8386da75d50cbc8
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index d16e27762fd27d9ffbdc0bf94369f4c9b1e042fd..41f6f0dacf5e0a73d575e30a528bbcd781d81500 100644
index 09a708a38234415fb72484bb191d9d54f0fdb3bf..11da33b45cfa37ec313d4de5b2c09111a5ef9186 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -362,6 +362,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -363,6 +363,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
const base::UnguessableToken& throttling_profile_id,
const base::UnguessableToken& throttling_client_id,
std::vector<mojom::MatchedNetworkConditionsPtr> conditions) override;
@@ -63,7 +63,7 @@ index d16e27762fd27d9ffbdc0bf94369f4c9b1e042fd..41f6f0dacf5e0a73d575e30a528bbcd7
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CT_SUPPORTED)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 896917429ed60bfe6bc94f92587613d3f9f55d2b..a406168808b0719ca22109b3a3363ba2db06e24d 100644
index e0ab461f672fbd0da5c71774ae5b66af6feea751..c05b24a4fe489a32d084c81ea86c53d794d23379 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1464,6 +1464,9 @@ interface NetworkContext {
@@ -77,7 +77,7 @@ index 896917429ed60bfe6bc94f92587613d3f9f55d2b..a406168808b0719ca22109b3a3363ba2
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index d2ac1758f2990d2fa675b2e6780f0cc12b9992ed..9388281e5093e8a608c249b6889d953f949a5a3d 100644
index 45d146ce2808a0fc66941ca8f941a0a4e4ea0572..7d3a4c80043d9349cff06c4a4bc59793077c40e7 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -175,6 +175,7 @@ class TestNetworkContext : public mojom::NetworkContext {
patches/chromium/feat_carry_embedder_startup_data_in_createnewwindowreply.patch
+5 -5
View File
@@ -26,10 +26,10 @@ hook called before the new RenderFrame is created so it can be picked up
by RenderFrameCreated() on the same call stack.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 5e38acee26fc8aab78580e952315c9677b3bbe01..8d2f19ba73a389ec0cce3b2a93f58dd52f0b6e9e 100644
index b9f2d12a01bfa94f7ee1d7c69cc4fb4da3a017fe..97e7fd8eaad821f3717645bd91f647c4a71e6396 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -11066,7 +11066,12 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -11102,7 +11102,12 @@ void RenderFrameHostImpl::CreateNewWindow(
new_main_rfh->GetSiteInstance()->browsing_instance_token(),
delegate_->GetColorProviderColorMaps(),
/*widget_screen_rect=*/std::nullopt,
@@ -71,7 +71,7 @@ index c1a08cef12a58935839bfa42f937b2ee65fb39d2..8894901c171f0e90951a3a6dd3aa4052
// A per-navigation interface passed along with the BeginNavigation call, used
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 225a1e707b6b6b37210b04acba30404a567f20f1..f3b7b2433d086c0b3eaab1fe519adb196661508e 100644
index ce067b55dfa7fc63de669984cb9c4776cc3f0f5f..8b3430a641beccb641a6fcab63a187ab513a7266 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -851,6 +851,13 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -89,7 +89,7 @@ index 225a1e707b6b6b37210b04acba30404a567f20f1..f3b7b2433d086c0b3eaab1fe519adb19
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 8c11e7da0ac23dc4f75c06c079d6de7807a0593a..40083916171a6fb1386a4fbefc24227052c3c9e7 100644
index 6e4593e3ae8fe4a1808a3250346a73936677207e..13bf6248d9818612c1473243c74c3ed24f7c4afb 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -63,6 +63,7 @@
@@ -100,7 +100,7 @@ index 8c11e7da0ac23dc4f75c06c079d6de7807a0593a..40083916171a6fb1386a4fbefc242270
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/message_pipe.h"
@@ -1314,6 +1315,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1315,6 +1316,17 @@ class CONTENT_EXPORT ContentBrowserClient {
bool opener_suppressed,
bool* no_javascript_access);
patches/chromium/feat_corner_smoothing_css_rule_and_blink_painting.patch
+10 -10
View File
@@ -133,10 +133,10 @@ index af06c8edfad9f6c4dcb098f7f00be14edcc5bba2..b4968491945d9f4d7f26b41ae3be4fe9
} // namespace css_longhand
} // namespace blink
diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
index aa6daa9b29e98a8b4f9e68cb0a4f9753f9824bac..37d172f1b4b2fdaf294e5edf32861afb48fa4246 100644
index cf1b546b34bec9165831b378edaa861553039788..5b48bf07a1b1ea9ca8fc8a2e6cc8906f8c557961 100644
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
@@ -4275,6 +4275,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
@@ -4231,6 +4231,15 @@ PositionTryFallback StyleBuilderConverter::ConvertSinglePositionTryFallback(
return PositionTryFallback(scoped_name, tactic_list);
}
@@ -153,10 +153,10 @@ index aa6daa9b29e98a8b4f9e68cb0a4f9753f9824bac..37d172f1b4b2fdaf294e5edf32861afb
const CSSValue& value) {
const auto& list = To<CSSValueList>(value);
diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
index 3ffc4fc86d7af9f8a0d2b12109759164f24eae0a..9e680f0ff181f08ecac15d469e92ef4e6fecc3e9 100644
index 6f0f82a3b102293ec5eb426dce27a4820578f4c2..967b73ff46a72b049aa0799a5457da9839e3c596 100644
--- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.h
@@ -477,6 +477,7 @@ class StyleBuilderConverter {
@@ -465,6 +465,7 @@ class StyleBuilderConverter {
StyleResolverState&,
const CSSValue&,
bool allow_any_keyword_in_position_area = false);
@@ -165,10 +165,10 @@ index 3ffc4fc86d7af9f8a0d2b12109759164f24eae0a..9e680f0ff181f08ecac15d469e92ef4e
static TextOverflowData ConvertTextOverflow(StyleResolverState&,
const CSSValue&);
diff --git a/third_party/blink/renderer/core/paint/contoured_border_geometry.cc b/third_party/blink/renderer/core/paint/contoured_border_geometry.cc
index b721dd3809c0b6c89574a515bac32d397a1bfb09..750a3603bd18680228220b831709d3271e96afa8 100644
index 2976bcc89a26701aeb829c0fe0a205defe1e4997..85642753239137de0e4e8c8f4654f131e7de5df7 100644
--- a/third_party/blink/renderer/core/paint/contoured_border_geometry.cc
+++ b/third_party/blink/renderer/core/paint/contoured_border_geometry.cc
@@ -53,6 +53,24 @@ float EffectiveCurvature(Superellipse superellipse, const gfx::SizeF& radius) {
@@ -54,6 +54,24 @@ float EffectiveCurvature(Superellipse superellipse, const gfx::SizeF& radius) {
: superellipse.Exponent();
}
@@ -193,7 +193,7 @@ index b721dd3809c0b6c89574a515bac32d397a1bfb09..750a3603bd18680228220b831709d327
gfx::QuadF ComputeHullQuad(const ContouredRect::Corner& corner) {
const gfx::PointF half_corner = corner.HalfCorner();
const gfx::PointF perpendicular_line =
@@ -164,7 +182,8 @@ ContouredRect ComputeContouredBorderFromStyle(
@@ -165,7 +183,8 @@ ContouredRect ComputeContouredBorderFromStyle(
EffectiveCurvature(style.CornerTopLeftShape(), radii.TopLeft()),
EffectiveCurvature(style.CornerTopRightShape(), radii.TopRight()),
EffectiveCurvature(style.CornerBottomRightShape(), radii.BottomRight()),
@@ -204,10 +204,10 @@ index b721dd3809c0b6c89574a515bac32d397a1bfb09..750a3603bd18680228220b831709d327
return result;
}
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 817d8653da0dd6307d1663385aa698253092e774..8bc20d06c5f4fa7c734178f7ed937071285298e5 100644
index 872194865b78779be5675dcc895b9856aa5c1bf4..7cafc2c0cb2da2e391e19c41197e4c9834aa48e7 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1745,6 +1745,8 @@ component("platform") {
@@ -1743,6 +1743,8 @@ component("platform") {
"widget/widget_base.h",
"widget/widget_base_client.h",
"windows_keyboard_codes.h",
@@ -315,7 +315,7 @@ index 9d125de843259dae40e6b08eaf65ea3650435295..428219fb35d7a967dcaee91aa1c3628e
auto draw_as_single_path = [&]() {
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index f4aac923866bdfe12187d630d804f3e3e6042929..e54930c610e8f6a5939f7e3fa8d26dcecba59360 100644
index c105616d3f7306618e8bc89cfc7414354e337d9b..e6afd4ea5751378d306100b176877d7a7ebbfe9b 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -237,6 +237,10 @@
patches/chromium/feat_deliver_service_worker_preload_data_via_embeddedworkerstartparams.patch
+3 -3
View File
@@ -33,7 +33,7 @@ index de70e90d1fb9aff03ab972c15aedd618358fc1d1..9b3d66e0e646d384f24d1b905c1e7b59
if (policy_container_host_) {
params->policy_container =
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index f3b7b2433d086c0b3eaab1fe519adb196661508e..12eb36a66ba2a1351aad00b7c00aee21cf318e9b 100644
index 8b3430a641beccb641a6fcab63a187ab513a7266..a16c9ca549dd2c168b54653f0a1832a8bc4cf247 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -858,6 +858,13 @@ ContentBrowserClient::GetExtraCreateNewWindowReplyData(
@@ -51,10 +51,10 @@ index f3b7b2433d086c0b3eaab1fe519adb196661508e..12eb36a66ba2a1351aad00b7c00aee21
ContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 40083916171a6fb1386a4fbefc24227052c3c9e7..186dcf7e4bdaf31af4f8cc8e32ec533e6baf1f6f 100644
index 13bf6248d9818612c1473243c74c3ed24f7c4afb..bbe7806590875a4d928d9d811d37df2b8c9034c0 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1326,6 +1326,17 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1327,6 +1327,17 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* new_window_main_frame,
const GURL& target_url);
patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch
+10 -10
View File
@@ -17,7 +17,7 @@ headers, moving forward we should find a way in upstream to provide
access to these headers for loader clients created on the browser process.
diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
index 8a8e9165fa604bca66ddbf48d569d277c4b6aa96..01baf2507f48a9ce49263e29ef1f51d5ad78a3a5 100644
index bcc324b65625127564d1d69a0989aedbe94e9ea4..3dc6bf763974bfe79ccedd087621350e62e04b9c 100644
--- a/services/network/public/cpp/resource_request.cc
+++ b/services/network/public/cpp/resource_request.cc
@@ -203,6 +203,7 @@ ResourceRequest::TrustedParams& ResourceRequest::TrustedParams::operator=(
@@ -28,7 +28,7 @@ index 8a8e9165fa604bca66ddbf48d569d277c4b6aa96..01baf2507f48a9ce49263e29ef1f51d5
enabled_client_hints = other.enabled_client_hints;
cookie_observer =
Clone(&const_cast<mojo::PendingRemote<mojom::CookieAccessObserver>&>(
@@ -243,6 +244,7 @@ bool ResourceRequest::TrustedParams::EqualsForTesting(
@@ -241,6 +242,7 @@ bool ResourceRequest::TrustedParams::EqualsForTesting(
const TrustedParams& other) const {
return isolation_info.IsEqualForTesting(other.isolation_info) &&
disable_secure_dns == other.disable_secure_dns &&
@@ -37,7 +37,7 @@ index 8a8e9165fa604bca66ddbf48d569d277c4b6aa96..01baf2507f48a9ce49263e29ef1f51d5
allow_cookies_from_browser == other.allow_cookies_from_browser &&
include_request_cookies_with_response ==
diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
index 684b6e2f5bcfb3b0926bc897057ae2dc59b69e1f..46af4300a068f7bdc0f7767ad14ef9a451ca7f49 100644
index 045121cc67fceb72cae493fff74197437a246896..de40e09276c9cec438a9900f5b823aef4f2be2e3 100644
--- a/services/network/public/cpp/resource_request.h
+++ b/services/network/public/cpp/resource_request.h
@@ -116,6 +116,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
@@ -49,7 +49,7 @@ index 684b6e2f5bcfb3b0926bc897057ae2dc59b69e1f..46af4300a068f7bdc0f7767ad14ef9a4
mojo::PendingRemote<mojom::CookieAccessObserver> cookie_observer;
mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
index 0ae84efaeaf664857afa280ababf28f271291b48..d0957ced725eac4795a1948a5f0820f88a9c306e 100644
index 11f781fb9d8b687db88922cbccb9cc4a4ba53df3..159e2c96992c676594613198ef8b2942be7b1942 100644
--- a/services/network/public/cpp/url_request_mojom_traits.cc
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
@@ -67,6 +67,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
@@ -61,7 +61,7 @@ index 0ae84efaeaf664857afa280ababf28f271291b48..d0957ced725eac4795a1948a5f0820f8
return false;
}
diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
index 03653541a9216c493b7374d830b78f4e91cbcf49..76b2afad8537b5f21145e06350067eadf895701f 100644
index f9569880651968224c0425a9938c517ad19f69c0..9920528947a32694c609f52d389b7c18b3ad8797 100644
--- a/services/network/public/cpp/url_request_mojom_traits.h
+++ b/services/network/public/cpp/url_request_mojom_traits.h
@@ -107,6 +107,10 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
@@ -76,7 +76,7 @@ index 03653541a9216c493b7374d830b78f4e91cbcf49..76b2afad8537b5f21145e06350067ead
network::ResourceRequest::TrustedParams::EnabledClientHints>&
enabled_client_hints(
diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
index 54a18f27c5409bd5893e2dda988581519cb8ca86..5b462dca6277dd542d56344e45d9e41709a7d3a9 100644
index 6885d6fb6ad69b5e5bcb090fe2910260e88a8e55..bba7c9922ca6a2dc0c217bf06fde5141f8b326df 100644
--- a/services/network/public/mojom/url_request.mojom
+++ b/services/network/public/mojom/url_request.mojom
@@ -111,6 +111,9 @@ struct TrustedUrlRequestParams {
@@ -112,10 +112,10 @@ index 2551c74d161edc11e3d4e95c858c144a063ae80a..a3d1eb8d487a207a5a9c8cdc01ae01dd
string mime_type;
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index ceb7aa322339be65889e1a4e26b4a46c369e9dc4..9625b84b5d6e748a52e3387a2df41e40fd3fb777 100644
index 8cff0e93d7b9cd615e67cdf5c428075ae8f30051..08bea307ca72602f95d12ba9ccc924d84bc128bc 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -373,6 +373,9 @@ URLLoader::URLLoader(
@@ -372,6 +372,9 @@ URLLoader::URLLoader(
mojo::SimpleWatcher::ArmingPolicy::MANUAL,
TaskRunner(request.priority)),
per_factory_orb_state_(context.GetMutableOrbState()),
@@ -125,7 +125,7 @@ index ceb7aa322339be65889e1a4e26b4a46c369e9dc4..9625b84b5d6e748a52e3387a2df41e40
devtools_request_id_(request.devtools_request_id),
options_(PopulateOptions(options,
factory_params_->is_orb_enabled,
@@ -572,7 +575,7 @@ void URLLoader::SetUpUrlRequestCallbacks(
@@ -571,7 +574,7 @@ void URLLoader::SetUpUrlRequestCallbacks(
&URLLoader::IsSharedDictionaryReadAllowed, base::Unretained(this)));
}
@@ -134,7 +134,7 @@ index ceb7aa322339be65889e1a4e26b4a46c369e9dc4..9625b84b5d6e748a52e3387a2df41e40
url_request_->SetResponseHeadersCallback(base::BindRepeating(
&URLLoader::SetRawResponseHeaders, base::Unretained(this)));
}
@@ -1186,6 +1189,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
@@ -1185,6 +1188,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
}
response_ = BuildResponseHead();
patches/chromium/feat_let_the_host_of_a_remote_nswindow_set_more_of_its_behavior.patch
+9 -9
View File
@@ -26,10 +26,10 @@ it ever does.
Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h
index bd38cfa246d4b7fadc221bf70c2e362995093e4a..d4f542d1d81b093f6b9a27a5f787a9a49a1e88dc 100644
index 834897f345154f48f868fa25d6e87fad8666e10b..793fa52e3a378ecbed18f1c2cfa76b9f832802fc 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h
@@ -320,6 +320,10 @@ class REMOTE_COCOA_APP_SHIM_EXPORT NativeWidgetNSWindowBridge
@@ -325,6 +325,10 @@ class REMOTE_COCOA_APP_SHIM_EXPORT NativeWidgetNSWindowBridge
void SetCALayerParams(gfx::CALayerParams ca_layer_params) override;
void SetWindowTitle(const std::u16string& title) override;
void SetIgnoresMouseEvents(bool ignores_mouse_events) override;
@@ -40,7 +40,7 @@ index bd38cfa246d4b7fadc221bf70c2e362995093e4a..d4f542d1d81b093f6b9a27a5f787a9a4
void MakeFirstResponder() override;
void SortSubviews(
const std::vector<uint64_t>& associated_subview_ids) override;
@@ -475,6 +479,10 @@ class REMOTE_COCOA_APP_SHIM_EXPORT NativeWidgetNSWindowBridge
@@ -480,6 +484,10 @@ class REMOTE_COCOA_APP_SHIM_EXPORT NativeWidgetNSWindowBridge
std::unique_ptr<CocoaWindowMoveLoop> window_move_loop_;
ui::mojom::ModalType modal_type_ = ui::mojom::ModalType::kNone;
bool is_translucent_window_ = false;
@@ -52,10 +52,10 @@ index bd38cfa246d4b7fadc221bf70c2e362995093e4a..d4f542d1d81b093f6b9a27a5f787a9a4
raw_ptr<NativeWidgetNSWindowBridge> parent_ =
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 7cbf2596bf6b0dc70568f5a591745c38e3572ef9..a4ba2c3e29cf5107dc8537f19a026efc6d5aa99a 100644
index 1febc578747baf590386f59c20a8ee349394c67a..dc5b2c305ef353aeaf785c818724efc945a36071 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -1628,6 +1628,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -1632,6 +1632,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
gfx::ApplyNSWindowSizeConstraints(window_, min_size, max_size,
shows_resize_controls,
shows_fullscreen_controls);
@@ -63,7 +63,7 @@ index 7cbf2596bf6b0dc70568f5a591745c38e3572ef9..a4ba2c3e29cf5107dc8537f19a026efc
}
void NativeWidgetNSWindowBridge::OnShowAnimationComplete() {
@@ -2043,7 +2044,10 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -2047,7 +2048,10 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
void NativeWidgetNSWindowBridge::SetAspectRatio(
const gfx::SizeF& aspect_ratio,
const gfx::Size& excluded_margin) {
@@ -75,7 +75,7 @@ index 7cbf2596bf6b0dc70568f5a591745c38e3572ef9..a4ba2c3e29cf5107dc8537f19a026efc
[window_delegate_ setAspectRatio:aspect_ratio.width() / aspect_ratio.height()
excludedMargin:excluded_margin];
}
@@ -2123,6 +2127,56 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -2127,6 +2131,56 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
[window_ setIgnoresMouseEvents:ignores_mouse_events];
}
@@ -223,10 +223,10 @@ index 8ca5673a225b69b5630383ed9673653ba03a0e97..f650180f02ef8c5c92421a5bec35f1b1
MakeFirstResponder();
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index 0d796595adc97607f9c84990123d8a60a84d9ec8..58b73d061e17ce46c6a714e42ad9ed0190f2d328 100644
index d88a457d25459a4b97495dfeabd58c1aebbff4c8..17592ecae14a9ffaf1d678e1ef7db033aa9403dd 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -907,8 +907,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -910,8 +910,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
if (@available(macOS 14, *)) {
if (application_host_ &&
new_state == WindowVisibilityState::kShowAndActivateWindow) {
patches/chromium/fix_add_reinitializegeneratedcodecachecontext_to.patch
+4 -4
View File
@@ -14,10 +14,10 @@ This new method properly shuts down the existing context and creates a
fresh one, allowing Electron session.setCodeCachePath() to work correctly.
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index ae1d249b4f11a492db444c8b5994c671289853d4..893289e44dcb2802736dc86c2fde437b8ca5bd25 100644
index aa72cfddeb5dd977fcc54917a3a3968b73c2af14..1c68fa8c2611a199eb01d7a0fbc75bf9cc0b4824 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1876,6 +1876,22 @@ StoragePartitionImpl::GetGeneratedCodeCacheContext() {
@@ -1891,6 +1891,22 @@ StoragePartitionImpl::GetGeneratedCodeCacheContext() {
return generated_code_cache_context_.get();
}
@@ -41,10 +41,10 @@ index ae1d249b4f11a492db444c8b5994c671289853d4..893289e44dcb2802736dc86c2fde437b
StoragePartitionImpl::GetDevToolsBackgroundServicesContext() {
CHECK(initialized_, base::NotFatalUntil::M159);
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 8250745862f469ac9eb01f8b392580ce0cc296fc..fcefb1bddab49aa0fdfcfdd26294e744090d72a8 100644
index 55e9116fe28e72f83ff8d8f2f4e6c819e242bc33..78055e8d257f19e1d64949ebd3db0dabb80184b2 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -187,6 +187,8 @@ class CONTENT_EXPORT StoragePartitionImpl
@@ -188,6 +188,8 @@ class CONTENT_EXPORT StoragePartitionImpl
DedicatedWorkerServiceImpl* GetDedicatedWorkerService() override;
SharedWorkerService* GetSharedWorkerService() override;
GeneratedCodeCacheContext* GetGeneratedCodeCacheContext() override;
patches/chromium/fix_adjust_headless_mode_handling_in_native_widget.patch
+7 -7
View File
@@ -67,7 +67,7 @@ index e1093d964d4f27fd3222dfa2a216ef5f5dffe3b5..9dc1e8a18b599813391e0e6ceee18fea
return _headless_info.get();
}
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index d2235a096f5ea7b5c3ecdc84af9b10a839615347..7cbf2596bf6b0dc70568f5a591745c38e3572ef9 100644
index cba29ad496d89a536f65ba8fb140466ed134cabd..1febc578747baf590386f59c20a8ee349394c67a 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -613,7 +613,7 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
@@ -94,10 +94,10 @@ index a41254c1f31654c1326b4bf1f29237bdf44bbe5a..8ca5673a225b69b5630383ed9673653b
StateRestorationData? state_restoration_data;
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
index 37cdddfb2f8309aa1bb331d2052eeff02fc5584b..c3547acc8b176181b950c98ea6d2d421830a63e6 100644
index e297e2645184ad2f27f563edab769eca2f1ae73f..12411c9107159aef28ba7d2ac5c973b333b49df4 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
@@ -580,6 +580,7 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
@@ -588,6 +588,7 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
bool is_miniaturized_ = false;
bool is_window_key_ = false;
bool is_mouse_capture_active_ = false;
@@ -106,10 +106,10 @@ index 37cdddfb2f8309aa1bb331d2052eeff02fc5584b..c3547acc8b176181b950c98ea6d2d421
bool is_visible_on_all_workspaces_ = false;
gfx::Rect window_bounds_before_fullscreen_;
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index dcdfee94a5959f49422b4c37a0fbac9c7a378760..0d796595adc97607f9c84990123d8a60a84d9ec8 100644
index 839a159699bc3def84fd3ecd069fe344aef19c04..d88a457d25459a4b97495dfeabd58c1aebbff4c8 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -479,6 +479,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -481,6 +481,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
if (!is_tooltip) {
tooltip_manager_ = std::make_unique<TooltipManagerMac>(GetNSWindowMojo());
}
@@ -117,7 +117,7 @@ index dcdfee94a5959f49422b4c37a0fbac9c7a378760..0d796595adc97607f9c84990123d8a60
if (params.workspace.length()) {
if (std::optional<std::vector<uint8_t>> restoration_data =
@@ -496,6 +497,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -498,6 +499,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
window_params->modal_type = widget->widget_delegate()->GetModalType();
window_params->is_translucent =
params.opacity == Widget::InitParams::WindowOpacity::kTranslucent;
@@ -125,7 +125,7 @@ index dcdfee94a5959f49422b4c37a0fbac9c7a378760..0d796595adc97607f9c84990123d8a60
window_params->is_tooltip = is_tooltip;
// macOS likes to put shadows on most things. However, frameless windows
@@ -689,10 +691,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -691,10 +693,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
// case it will never become visible but we want its compositor to produce
// frames for screenshooting and screencasting.
UpdateCompositorProperties();
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
+2 -2
View File
@@ -30,10 +30,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 d20c526dc7a9b92a57496ac9caff37e3111b1f0a..0eae23304fbc1f29b87f81c792fbab13d61fd6d9 100644
index c8a4668f405e481c7c76273051cbbd73475a161c..3e6412bbbdcd60e5ec3056454a182cb72a7cf70d 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -13156,6 +13156,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
@@ -13182,6 +13182,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactoryUnchecked() {
target_rph_id);
}
patches/chromium/fix_handle_embedder_windows_shown_after_webcontentsviewcocoa_attach.patch
+3 -3
View File
@@ -29,10 +29,10 @@ before first show.
This patch can be removed if the changes are upstreamed to Chromium.
diff --git a/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm b/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
index d58fc9c26fc11de46d7fa909389af8eadec532fc..3a9430756b3d8f57fcfa747e922184fdda438655 100644
index a80c755cabdc89cbed8f27f13e106ad63fa3d36c..509e776041d28845bd0e51671e5a64430e943e68 100644
--- a/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/web_contents_view_cocoa.mm
@@ -532,7 +532,8 @@ - (void)updateWebContentsVisibility {
@@ -536,7 +536,8 @@ - (void)updateWebContentsVisibility {
Visibility visibility = Visibility::kVisible;
if ([self isHiddenOrHasHiddenAncestor] || ![self window])
visibility = Visibility::kHidden;
@@ -42,7 +42,7 @@ index d58fc9c26fc11de46d7fa909389af8eadec532fc..3a9430756b3d8f57fcfa747e922184fd
visibility = Visibility::kOccluded;
[self updateWebContentsVisibility:visibility];
@@ -576,11 +577,12 @@ - (void)viewWillMoveToWindow:(NSWindow*)newWindow {
@@ -587,11 +588,12 @@ - (void)viewWillMoveToWindow:(NSWindow*)newWindow {
}
- (void)windowChangedOcclusionState:(NSNotification*)aNotification {
patches/chromium/fix_move_autopipsettingshelper_behind_branding_buildflag.patch
+3 -3
View File
@@ -162,7 +162,7 @@ index 2786953a872abd331d777d64231adfd3b685e85e..9b9998cdcce0c183fe0d7c0633152649
// The display of the opener window, cached during
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index a9436ec55914d264cc59637860785881ad2dd16a..b2953144a85fbd0014f5285b9b430206e6d7b890 100644
index b786b9b6ac62573fc2977e2a075b3de1f17fdf35..4c8bfbd57122e7cda8ae1e60353387c7464f9518 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -116,8 +116,10 @@ constexpr gfx::Size kMinWindowSize(284, 160);
@@ -291,7 +291,7 @@ index a9436ec55914d264cc59637860785881ad2dd16a..b2953144a85fbd0014f5285b9b430206
// When the window is first shown, make the title and top controls
// visible for a few seconds.
@@ -2372,10 +2390,15 @@ void VideoOverlayWindowViews::MaybeUnregisterFrameSinkHierarchy() {
@@ -2374,10 +2392,15 @@ void VideoOverlayWindowViews::MaybeUnregisterFrameSinkHierarchy() {
}
bool VideoOverlayWindowViews::IsOverlayViewShown() const {
@@ -307,7 +307,7 @@ index a9436ec55914d264cc59637860785881ad2dd16a..b2953144a85fbd0014f5285b9b430206
if (overlay_view_) {
// Remove and delete the outgoing view. Note the trailing `T` on the method
// name -- this removes `overlay_view_` and returns a unique_ptr to it which
@@ -2384,6 +2407,7 @@ void VideoOverlayWindowViews::RemoveOverlayViewIfExists() {
@@ -2386,6 +2409,7 @@ void VideoOverlayWindowViews::RemoveOverlayViewIfExists() {
GetContentsView()->RemoveChildViewT(overlay_view_.ExtractAsDangling());
OnSizeConstraintsChanged();
}
patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
+3 -3
View File
@@ -9,7 +9,7 @@ focus node change via TextInputManager.
chromium-bug: https://crbug.com/1369605
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 8339aff54788d987cbd2b8c42172e699dbac6478..747154464c1aa1d8add7c240dd231ef30c32e96e 100644
index f911072ec8be3b7dd01b1a64fa92e22394d03f69..8cc358e8658a3f10002b1e278f6381136478a99c 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -3861,6 +3861,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
@@ -26,10 +26,10 @@ index 8339aff54788d987cbd2b8c42172e699dbac6478..747154464c1aa1d8add7c240dd231ef3
RenderWidgetHostViewAura* popup_child_host_view) {
popup_child_host_view_ = popup_child_host_view;
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 43e396e1f13140401959a76937628a024ddf68ea..db8d2f570e0e86362bba7c8373acdb9d3d366fa3 100644
index 0ccc352cad46a27fc3b9d64a2e15e15239851d1d..d5da139d012b0a237cbe02a34e53aee38bcc55d3 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -690,6 +690,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
@@ -687,6 +687,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
RenderWidgetHostViewBase* updated_view) override;
void OnTextSelectionChanged(TextInputManager* text_input_mangager,
RenderWidgetHostViewBase* updated_view) override;
patches/chromium/fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
+2 -2
View File
@@ -8,10 +8,10 @@ such as the background turning black when maximizing the window and
dynamic background material settings not taking effect.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 0f0b0853410ec111f7fde3b991681bcf4046af8b..d7a65783e0afddf49c216f670f37cef1ed747459 100644
index f74309d3c0d9c474e1dff275d9ef263562922d44..e9b3f89257a7f444c84d063e299ecfac0006bbb2 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -247,6 +247,10 @@ bool DesktopWindowTreeHostWin::IsInNativeMoveResizeLoop() const {
@@ -267,6 +267,10 @@ bool DesktopWindowTreeHostWin::IsInNativeMoveResizeLoop() const {
message_handler_->IsInNativeMenuLoop());
}
patches/chromium/fix_return_v8_value_from_localframe_requestexecutescript.patch
+2 -2
View File
@@ -107,10 +107,10 @@ index ca87f409296aec0278f3d05138aaaac6b998ed8f..96f67248f30198279d535a2ad719d1c5
mojom::blink::WantResultOption,
mojom::blink::PromiseResultOption,
diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
index 27a63506937d100891856b77215800bff9f354cd..c6691e79b5940cfba68972d6affd5b6ae8dd6bdc 100644
index 265ed6391080c54377a59f9274f374ca21a51704..5b59e6ac0582878f4d7e9beca3092418b953b928 100644
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
@@ -1009,6 +1009,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
@@ -1010,6 +1010,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
std::move(callback).Run(value ? std::move(*value) : base::Value());
},
std::move(callback)),
patches/chromium/frame_host_manager.patch
+2 -2
View File
@@ -20,10 +20,10 @@ index 97b080c56f58b7e9cbc78ebb5e639601cdc334c4..06e7b74af7e2c40cde2642307ee293e5
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 3bdab819749ab7e693ad40852645dce700e701eb..8c11e7da0ac23dc4f75c06c079d6de7807a0593a 100644
index 95c7ac3c7f7aca3c283b22a2a5cf6f1b0479ea3f..6e4593e3ae8fe4a1808a3250346a73936677207e 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -354,6 +354,11 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -355,6 +355,11 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ~ContentBrowserClient() = default;
patches/chromium/gritsettings_resource_ids.patch
+1 -1
View File
@@ -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 928475db8a60081d6bbaec025948973bcc65f888..183be197fb1ab9f96460e600dc91e3b2e7ca70bf 100644
index 3d8a3243322e2160ef29f062a6072ef0ce7094db..3e9b556a1ab69288f1479c36e921181438372025 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -1808,6 +1808,11 @@
patches/chromium/mas_avoid_private_macos_api_usage.patch.patch
+25 -25
View File
@@ -58,7 +58,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
system priority.
diff --git a/base/BUILD.gn b/base/BUILD.gn
index ea07454ba2928ad744ff61f3c4c0602d3489ce34..d81cc42c3bf121930c2faa450d182c1fff9ce60c 100644
index 1dbe04fa17f42006afac37d062912ed1ef709957..4f4d61594aee602b9217eee43defe5b5e29dde3b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1154,6 +1154,7 @@ component("base") {
@@ -851,7 +851,7 @@ index 0e5d0e59d926ecd0ea53ef7c3eaaada1af40a044..e1093d964d4f27fd3222dfa2a216ef5f
- (NSWindow*)rootWindow {
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 5abdca1cb441d306b5dbea7d7bf7e1400ce3a14d..d2235a096f5ea7b5c3ecdc84af9b10a839615347 100644
index d753945e9b9da51d4dcfa1061839d82c0ac8bc53..cba29ad496d89a536f65ba8fb140466ed134cabd 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -42,6 +42,7 @@
@@ -1013,10 +1013,10 @@ index 45e8631ea6e5497edb90b91223d962abe3071849..dbd8cbc192931ee7821f7e76923c6cb2
return kAttributes;
}
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 2bfd29be2bb6e68d521201aea3b1a40d29a32157..959caf0b3b0d88fa7d0bbe455bf604b8a6ef4c45 100644
index 8cc4642c45004cc0c8de4d952c78c2aa7f8e0f83..bb6e40d969682613ac459b6d1699aa208caa5685 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -383,6 +383,7 @@ source_set("browser") {
@@ -384,6 +384,7 @@ source_set("browser") {
"//ui/webui/resources",
"//v8",
"//v8:v8_version",
@@ -1025,7 +1025,7 @@ index 2bfd29be2bb6e68d521201aea3b1a40d29a32157..959caf0b3b0d88fa7d0bbe455bf604b8
public_deps = [
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 4fcbaac7dc34f51a6f3d8754d5a5f84042649451..3fcb1eedfa9ba7d5063972f11807bbf18552ab48 100644
index 3bc470d203b6275d812bcf8d425e7bc5e54b4404..9784dbc87dde79a904f26a3f35b47aad3f43a66c 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -26,6 +26,7 @@
@@ -1046,7 +1046,7 @@ index 4fcbaac7dc34f51a6f3d8754d5a5f84042649451..3fcb1eedfa9ba7d5063972f11807bbf1
@class RenderWidgetHostViewCocoa;
namespace content {
@@ -728,9 +731,11 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
@@ -725,9 +728,11 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
bool pointer_lock_unadjusted_movement_ = false;
@@ -1059,7 +1059,7 @@ index 4fcbaac7dc34f51a6f3d8754d5a5f84042649451..3fcb1eedfa9ba7d5063972f11807bbf1
ui::AXTreeID parent_ax_tree_id_ = ui::AXTreeIDUnknown();
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 10d8a0e16d6bd7e603eddabfd3f053f44d43d7a1..23b8154e7695d2fb4efbd777de6e84f2ad5d614e 100644
index d96670e866be63705f0cdee8c7d9291a3627f340..082a7197c3f7d596371ce05554fe3beacdf3e1b6 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -58,6 +58,7 @@
@@ -1228,7 +1228,7 @@ index a1068589ad844518038ee7bc15a3de9bc5cba525..1ff781c49f086ec8015c7d3c44567dbe
} // namespace content
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index a22c2b959397c41c967e615a9c51e35703e577f1..8bb7e9f280b20f1902776069dc230bda04acfdb5 100644
index e93880ca23768d298e5aadcd12e0eb4f3a174170..93d5ae942fe314d0f4b37fe689beb32ba7612c9b 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -649,6 +649,7 @@ static_library("test_support") {
@@ -1248,7 +1248,7 @@ index a22c2b959397c41c967e615a9c51e35703e577f1..8bb7e9f280b20f1902776069dc230bda
}
mojom("content_test_mojo_bindings") {
@@ -2059,6 +2062,7 @@ test("content_browsertests") {
@@ -2060,6 +2063,7 @@ test("content_browsertests") {
"//ui/shell_dialogs",
"//ui/snapshot",
"//ui/webui:test_support",
@@ -1256,7 +1256,7 @@ index a22c2b959397c41c967e615a9c51e35703e577f1..8bb7e9f280b20f1902776069dc230bda
]
if (!(is_chromeos && target_cpu == "arm64" && current_cpu == "arm")) {
@@ -3453,6 +3457,7 @@ test("content_unittests") {
@@ -3455,6 +3459,7 @@ test("content_unittests") {
"//ui/shell_dialogs",
"//ui/webui:test_support",
"//url",
@@ -2171,7 +2171,7 @@ index 9423a2891552e8df3ea5b05c720ab11795c4b92d..610c479ef03759d3082b42d7a402cbea
// Accessible object
if (AXElementWrapper::IsValidElement(value)) {
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index bf24872b5002f61820bae1a496d3332814f30dbf..8f1401184c874df7a1a258f2a60882dbdc76c057 100644
index e0fcd30792e12c1c7bc28470cd502a93e432de6c..dc516d885d7905e4ed46b03dd5e43f15c80add8f 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -367,6 +367,13 @@ component("base") {
@@ -2188,7 +2188,7 @@ index bf24872b5002f61820bae1a496d3332814f30dbf..8f1401184c874df7a1a258f2a60882db
if (is_ios) {
sources += [
"device_form_factor_ios.mm",
@@ -520,6 +527,12 @@ component("base") {
@@ -521,6 +528,12 @@ component("base") {
"//url",
]
@@ -2415,10 +2415,10 @@ index 618217772a2fa38077ca0913dc017ecc6a702142..f06c9cf5bd3d841935d4e7353e704027
// Query the display's refresh rate. To get a float number such as 59.95Hz,
// use 1.0/screen.minimumRefreshInterval instead of
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index c50d748fb83207ff46e5d46a8979ebea1d5c30f7..e4c4a8cdb71bc872e8dbf998b6bfa7a0ff053d25 100644
index 24bc26eb55c2e611cfd3834bbd2e7abfb40d0077..b1d0c90041ac9ba06e34bf24a6200f2379500294 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -284,6 +284,8 @@ component("gfx") {
@@ -285,6 +285,8 @@ component("gfx") {
"CoreGraphics.framework",
"CoreText.framework",
]
@@ -2488,10 +2488,10 @@ index 8826a46286029be6c4e6b9b6fcf3edb039b3be12..6d93048ea3d6d029e9d6252e12d1e975
sources += [
"test/desktop_window_tree_host_win_test_api.cc",
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.h b/ui/views/cocoa/native_widget_mac_ns_window_host.h
index a66a1f0ffaae89ab3f338fe2c80d907c34da6f91..37cdddfb2f8309aa1bb331d2052eeff02fc5584b 100644
index ae78821f982fa7c5cdf41b88c6419ac813cc50dc..e297e2645184ad2f27f563edab769eca2f1ae73f 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.h
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.h
@@ -20,6 +20,7 @@
@@ -21,6 +21,7 @@
#include "components/remote_cocoa/browser/scoped_cg_window_id.h"
#include "components/remote_cocoa/common/native_widget_ns_window.mojom.h"
#include "components/remote_cocoa/common/native_widget_ns_window_host.mojom.h"
@@ -2499,7 +2499,7 @@ index a66a1f0ffaae89ab3f338fe2c80d907c34da6f91..37cdddfb2f8309aa1bb331d2052eeff0
#include "mojo/public/cpp/bindings/associated_receiver.h"
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
@@ -36,7 +37,9 @@
@@ -37,7 +38,9 @@
#include "ui/views/window/dialog_observer.h"
@class NativeWidgetMacNSWindow;
@@ -2509,7 +2509,7 @@ index a66a1f0ffaae89ab3f338fe2c80d907c34da6f91..37cdddfb2f8309aa1bb331d2052eeff0
@class NSView;
namespace remote_cocoa {
@@ -530,10 +533,12 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
@@ -538,10 +541,12 @@ class VIEWS_EXPORT NativeWidgetMacNSWindowHost
mojo::AssociatedRemote<remote_cocoa::mojom::NativeWidgetNSWindow>
remote_ns_window_remote_;
@@ -2523,10 +2523,10 @@ index a66a1f0ffaae89ab3f338fe2c80d907c34da6f91..37cdddfb2f8309aa1bb331d2052eeff0
// Used to force the NSApplication's focused accessibility element to be the
// views::Views accessibility tree when the NSView for this is focused.
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c7a378760 100644
index 74bbf49cd0c3e1d114a92f118e830ec91772bf29..839a159699bc3def84fd3ecd069fe344aef19c04 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -24,6 +24,7 @@
@@ -25,6 +25,7 @@
#include "components/remote_cocoa/browser/ns_view_ids.h"
#include "components/remote_cocoa/browser/window.h"
#include "components/remote_cocoa/common/native_widget_ns_window.mojom.h"
@@ -2534,7 +2534,7 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
#include "mojo/public/cpp/bindings/self_owned_associated_receiver.h"
#include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
#include "ui/accessibility/accessibility_features.h"
@@ -374,8 +375,12 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -376,8 +377,12 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
if (in_process_ns_window_bridge_) {
return gfx::NativeViewAccessible(in_process_ns_window_bridge_->ns_view());
}
@@ -2547,7 +2547,7 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
}
gfx::NativeViewAccessible
@@ -391,8 +396,12 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -393,8 +398,12 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
[in_process_ns_window_bridge_->ns_view() window]);
}
@@ -2560,7 +2560,7 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
}
remote_cocoa::mojom::NativeWidgetNSWindow*
@@ -1650,9 +1659,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1725,9 +1734,11 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
// for PWAs. However this breaks accessibility on in-process windows,
// so set it back to NO when a local window gains focus. See
// https://crbug.com/41485830.
@@ -2572,7 +2572,7 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
// Explicitly set the keyboard accessibility state on regaining key
// window status.
if (is_key && is_content_first_responder) {
@@ -1805,17 +1816,20 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1880,17 +1891,20 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
const std::vector<uint8_t>& window_token,
const std::vector<uint8_t>& view_token) {
@@ -2593,7 +2593,7 @@ index 352ef08958711c421ef89c48125c7505ed024afe..dcdfee94a5959f49422b4c37a0fbac9c
*pid = getpid();
id element_id = GetNativeViewAccessible();
@@ -1828,6 +1842,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1903,6 +1917,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
}
*token = ui::RemoteAccessibility::GetTokenForLocalElement(element_id);
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
+11 -11
View File
@@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index aa6488c0923296c3549978b70f7b400b7d6f4607..559f8dad7946398798048cf32fae46556c787f3a 100644
index 68d93ae1a6be2dc681d0ff51f7a3946dbb6d8269..488552051cbe00ce6374581481f5fb3d4fedaa13 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -192,6 +192,11 @@
@@ -194,6 +194,11 @@
#include "services/network/ssl_private_key_proxy.h"
#endif
@@ -22,7 +22,7 @@ index aa6488c0923296c3549978b70f7b400b7d6f4607..559f8dad7946398798048cf32fae4655
#if BUILDFLAG(IS_CT_SUPPORTED)
// gn check does not account for BUILDFLAG(). So, for iOS builds, it will
// complain about a missing dependency on the target exposing this header. Add a
@@ -668,6 +673,132 @@ void RemoveInvalidationFilterCallback(
@@ -670,6 +675,132 @@ void RemoveInvalidationFilterCallback(
} // namespace
@@ -155,7 +155,7 @@ index aa6488c0923296c3549978b70f7b400b7d6f4607..559f8dad7946398798048cf32fae4655
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
NetworkContext::NetworkContextHttpAuthPreferences::
@@ -1132,6 +1263,12 @@ void NetworkContext::CreateSocketFactory(
@@ -1134,6 +1265,12 @@ void NetworkContext::CreateSocketFactory(
socket_factory_receivers_.Add(socket_factory_.get(), std::move(receiver));
}
@@ -168,7 +168,7 @@ index aa6488c0923296c3549978b70f7b400b7d6f4607..559f8dad7946398798048cf32fae4655
void NetworkContext::CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) {
@@ -2932,6 +3069,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2955,6 +3092,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
cert_verifier = std::make_unique<net::CachingCertVerifier>(
std::make_unique<net::CoalescingCertVerifier>(
std::move(cert_verifier)));
@@ -180,10 +180,10 @@ index aa6488c0923296c3549978b70f7b400b7d6f4607..559f8dad7946398798048cf32fae4655
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index bc99d58e885577b71f8fa5a919d8a47cd420b560..d16e27762fd27d9ffbdc0bf94369f4c9b1e042fd 100644
index e2f460d9676199b322bde4643fda1eebb6f7718d..09a708a38234415fb72484bb191d9d54f0fdb3bf 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -129,6 +129,7 @@ class SimpleUrlPatternMatcher;
@@ -130,6 +130,7 @@ class SimpleUrlPatternMatcher;
}
namespace network {
@@ -191,7 +191,7 @@ index bc99d58e885577b71f8fa5a919d8a47cd420b560..d16e27762fd27d9ffbdc0bf94369f4c9
class CookieManager;
class HostResolver;
class MdnsResponderManager;
@@ -272,6 +273,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -273,6 +274,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CreateURLLoaderFactory(
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
mojom::URLLoaderFactoryParamsPtr params) override;
@@ -200,7 +200,7 @@ index bc99d58e885577b71f8fa5a919d8a47cd420b560..d16e27762fd27d9ffbdc0bf94369f4c9
void ResetURLLoaderFactories() override;
void GetViaObliviousHttp(
mojom::ObliviousHttpRequestPtr request,
@@ -1118,6 +1121,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -1126,6 +1129,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
std::vector<base::OnceClosure> dismount_closures_;
#endif // BUILDFLAG(IS_DIRECTORY_TRANSFER_REQUIRED)
@@ -210,7 +210,7 @@ index bc99d58e885577b71f8fa5a919d8a47cd420b560..d16e27762fd27d9ffbdc0bf94369f4c9
std::unique_ptr<HostResolver> internal_host_resolver_;
std::set<std::unique_ptr<HostResolver>, base::UniquePtrComparator>
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index ccd9cc464b2a13eb355486fd472c21f4ca37388e..896917429ed60bfe6bc94f92587613d3f9f55d2b 100644
index 858f61f3879b8b5a00b1e950f7b0bf883ab74bd1..e0ab461f672fbd0da5c71774ae5b66af6feea751 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -351,6 +351,17 @@ struct SocketBrokerRemotes {
@@ -241,7 +241,7 @@ index ccd9cc464b2a13eb355486fd472c21f4ca37388e..896917429ed60bfe6bc94f92587613d3
CreateURLLoaderFactory(
pending_receiver<URLLoaderFactory> url_loader_factory,
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index e64989bf12639919df8f9055c46e7c32c74953ef..d2ac1758f2990d2fa675b2e6780f0cc12b9992ed 100644
index fe6ca7245396113fa851683c7252acf410314541..45d146ce2808a0fc66941ca8f941a0a4e4ea0572 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -68,6 +68,8 @@ class TestNetworkContext : public mojom::NetworkContext {
patches/chromium/notification_provenance.patch
+3 -3
View File
@@ -92,7 +92,7 @@ index 6f405c9b8c2a34ac071cc4c2b3bdc953c7f5ea1a..9346ccc6249672f133975386cc8c44fa
contents_.get()->GetPrimaryMainFrame()->GetWeakDocumentPtr(),
RenderProcessHost::NotificationServiceCreatorType::kDocument,
diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
index 3c200766a4b26e415b74b14ba04e7e199685fe00..693695165ddaf095210a5d1f8a2f7da5ac344617 100644
index 1d32b9f1478a3e387546d0aed03ee2dcd0da536c..65208aee94be271c9dc20d0504a67e693a8d2eaf 100644
--- a/content/browser/notifications/platform_notification_context_impl.cc
+++ b/content/browser/notifications/platform_notification_context_impl.cc
@@ -289,6 +289,7 @@ void PlatformNotificationContextImpl::Shutdown() {
@@ -113,7 +113,7 @@ index 3c200766a4b26e415b74b14ba04e7e199685fe00..693695165ddaf095210a5d1f8a2f7da5
}
diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
index 9bf238e64af483294ae3c3f18a4e9aed49a8658d..b9b2a4c8c387b8e8b4eb1f02fc0f891ceaa105a0 100644
index 3af870df8b7b8afc9edc1881bfaf07772656df86..520463a291fb58268f2c411b0325cc798f90db2f 100644
--- a/content/browser/notifications/platform_notification_context_impl.h
+++ b/content/browser/notifications/platform_notification_context_impl.h
@@ -47,6 +47,7 @@ class PlatformNotificationServiceProxy;
@@ -133,7 +133,7 @@ index 9bf238e64af483294ae3c3f18a4e9aed49a8658d..b9b2a4c8c387b8e8b4eb1f02fc0f891c
const GURL& document_url,
const WeakDocumentPtr& weak_document_ptr,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 5dbe1126f62679855efa307af388427b9e28c747..a0fb47c198354ce3b15db402c801897ab0f8cd56 100644
index 232d1c239df5c63ab02e7cf1f40c7ce02b710d23..f1d5908cdc666e215cc4ccf6e8fe6ad335bf9213 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2558,7 +2558,7 @@ void RenderProcessHostImpl::CreateNotificationService(
patches/chromium/patch_osr_control_screen_info.patch
+2 -2
View File
@@ -8,10 +8,10 @@ is updated correctly, instead of overriding GetScreenInfo which seems not
working.
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index dc9ade023294a0722795ae89e94cefc4a26635c3..e8c002a1c7e0e3152d382dc0d10d4577fd2e501b 100644
index db992bfe928ed8ed944fea7ccbd43074b256ea8a..dfb6597849b61219cf11385d3402c1ec8e319357 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -794,7 +794,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -783,7 +783,7 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// Generates the most current set of ScreenInfos from the current set of
// displays in the system for use in UpdateScreenInfo.
patches/chromium/picture-in-picture.patch
+6 -6
View File
@@ -46,7 +46,7 @@ index ffaf5f5f5f68ab6811c115ef66c8eb8f7f370027..6a43f6b515aacac600e3928a33bda6ed
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
kCloseButtonIconSize));
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881ad2dd16a 100644
index a20b96209b1a4b764141ebe910119047a3954cda..b786b9b6ac62573fc2977e2a075b3de1f17fdf35 100644
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -18,14 +18,18 @@
@@ -185,7 +185,7 @@ index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881
// The play/pause button and replay/forward 10 seconds buttons should not be
// visible while dragging the progress bar or for live media.
const bool is_dragging_progress_bar =
@@ -2116,14 +2128,20 @@ gfx::Rect VideoOverlayWindowViews::GetProgressViewBounds() {
@@ -2118,14 +2130,20 @@ gfx::Rect VideoOverlayWindowViews::GetProgressViewBounds() {
}
gfx::Rect VideoOverlayWindowViews::GetLiveCaptionButtonBounds() {
@@ -206,7 +206,7 @@ index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881
}
gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
@@ -2135,6 +2153,7 @@ gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
@@ -2137,6 +2155,7 @@ gfx::Rect VideoOverlayWindowViews::GetToggleMuteButtonBounds() {
bool VideoOverlayWindowViews::HasHighMediaEngagement(
const url::Origin& origin) const {
@@ -214,7 +214,7 @@ index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881
MediaEngagementService* service =
MediaEngagementService::Get(Profile::FromBrowserContext(
GetController()->GetWebContents()->GetBrowserContext()));
@@ -2143,6 +2162,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
@@ -2145,6 +2164,8 @@ bool VideoOverlayWindowViews::HasHighMediaEngagement(
}
return service->HasHighEngagement(origin);
@@ -223,7 +223,7 @@ index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881
}
bool VideoOverlayWindowViews::IsTrustedForMediaPlayback() const {
@@ -2409,11 +2430,14 @@ void VideoOverlayWindowViews::UpdateTimestampLabel(base::TimeDelta current_time,
@@ -2411,11 +2432,14 @@ void VideoOverlayWindowViews::UpdateTimestampLabel(base::TimeDelta current_time,
}
void VideoOverlayWindowViews::OnLiveCaptionButtonPressed() {
@@ -238,7 +238,7 @@ index 7c2536e4d975ce459843c84d97156e057722b5da..a9436ec55914d264cc59637860785881
if (wanted_visibility == live_caption_dialog_->GetVisible()) {
return;
}
@@ -2441,6 +2465,7 @@ void VideoOverlayWindowViews::SetLiveCaptionDialogVisibility(
@@ -2443,6 +2467,7 @@ void VideoOverlayWindowViews::SetLiveCaptionDialogVisibility(
if (toggle_mute_button_) {
toggle_mute_button_->SetEnabled(!wanted_visibility);
}
patches/chromium/printing.patch
+1 -1
View File
@@ -712,7 +712,7 @@ index 6acf5b006b7e2eafeda1c37dad21c989f9adc534..c6dab044543c5eb0b90aa9230d7bf29b
// runs a nested run loop in the renderer until print preview for
// window.print() finishes.
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index da96939c2380725236a0d1547520ca6d7152ba81..8246c03c75adf490c301199f2764d8ae273739d7 100644
index 2d3d1185628cabcf5e9e8b656a8011c95dbbfe66..9c7e897fd1e0c2f8ad593947ced7dd8b11f65f2e 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -56,6 +56,7 @@
patches/chromium/support_mixed_sandbox_with_zygote.patch
+1 -1
View File
@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index a0fb47c198354ce3b15db402c801897ab0f8cd56..951ecd1e1ad2a0d0dd329b9e80566c030719e8b8 100644
index f1d5908cdc666e215cc4ccf6e8fe6ad335bf9213..f412349c9a3c443a1a80c8bf15c3f385bcf6ec54 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2136,6 +2136,10 @@ bool RenderProcessHostImpl::Init() {
patches/chromium/webview_fullscreen.patch
+2 -2
View File
@@ -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 f2e64e5569741000552218689ae5edf1f1d63791..5e38acee26fc8aab78580e952315c9677b3bbe01 100644
index d40577f4f1b90fb8c91711bc4852d08b05aace55..b9f2d12a01bfa94f7ee1d7c69cc4fb4da3a017fe 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9797,6 +9797,17 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -9833,6 +9833,17 @@ void RenderFrameHostImpl::EnterFullscreen(
}
}
patches/v8/build_warn_instead_of_abort_on_builtin_pgo_profile_mismatch.patch
+2 -2
View File
@@ -15,10 +15,10 @@ Rather than disabling builtins PGO entirely, warn and skip mismatched
builtins so all other builtins still benefit from PGO.
diff --git a/BUILD.gn b/BUILD.gn
index 4619f318dcbed4bf026732e3537f59d30cb2e24d..f0548c53f28861a140fe4a5aa8d58e86ce5aafed 100644
index 413bc76f3927ecca1b3c077c2bcb9eebaf978b26..603ded056a129a7b0f024f3d7c850cf3052055f5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3340,9 +3340,11 @@ template("run_mksnapshot") {
@@ -3339,9 +3339,11 @@ template("run_mksnapshot") {
"--turbo-profiling-input",
rebase_path(v8_builtins_profiling_log_file, root_build_dir),
patches/v8/fix_allow_embedder_slots_of_non-api_objects_in_snapshot.patch
+3 -3
View File
@@ -17,10 +17,10 @@ IterateJSObjectBodyImpl() visits.
This should be upstreamed.
diff --git a/src/snapshot/serializer.cc b/src/snapshot/serializer.cc
index 3fd1d50a77810a9ec6dd7014a195bbf398e3942b..c0eac923dccd4dff1ae9147647d7059f70e9c21b 100644
index f85057774adbc1ad65f3fe4de24b82ba2e9446db..e951949bc40b74e4510ae27cc0adb8b0a0ee2265 100644
--- a/src/snapshot/serializer.cc
+++ b/src/snapshot/serializer.cc
@@ -19,6 +19,7 @@
@@ -22,6 +22,7 @@
#include "src/objects/instance-type-checker.h"
#include "src/objects/instance-type.h"
#include "src/objects/js-array-buffer-inl.h"
@@ -28,7 +28,7 @@ index 3fd1d50a77810a9ec6dd7014a195bbf398e3942b..c0eac923dccd4dff1ae9147647d7059f
#include "src/objects/map.h"
#include "src/objects/objects-body-descriptors-inl.h"
#include "src/objects/slots-inl.h"
@@ -1166,8 +1167,8 @@ void Serializer::ObjectSerializer::VisitCppHeapPointer(
@@ -1231,8 +1232,8 @@ void Serializer::ObjectSerializer::VisitCppHeapPointer(
// We serialize the slot as initialized-but-unused slot. The actual API
// wrapper serialization is implemented in
// `ContextSerializer::SerializeApiWrapperFields()`.