Skip to content

Commit 19e7af9

Browse files
electron-botJohn Kleinschmidtdeepak1556Electron Botcodebytere
authored
chore: bump chromium to 85.0.4181.1 (10-x-y) (electron#23987)
* chore: bump chromium in DEPS to 85.0.4165.1 * chore: bump chromium in DEPS to 85.0.4166.1 * chore: bump chromium in DEPS to 85.0.4166.2 * chore: bump chromium in DEPS to 85.0.4166.3 * update patches * fixup! Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" (cherry picked from commit 2cc1caf) * update patches * Revert "[printing] Mojofy PrintHostMsg_CheckForCancel" (cherry picked from commit c2b3899) * Remove WebImeTextSpan https://chromium-review.googlesource.com/c/chromium/src/+/2225240 (cherry picked from commit d839261) * Remove PDFAnnotations flag altogether. https://chromium-review.googlesource.com/c/chromium/src/+/2229317 (cherry picked from commit 50384ed) * Rework find-from-selection so it's synchronous -- fixes flaky tests https://chromium-review.googlesource.com/c/chromium/src/+/2181570 (cherry picked from commit 3e92415) * Use ExtensionSystem::is_ready() instead of ExtensionService::is_ready() https://chromium-review.googlesource.com/c/chromium/src/+/2207499 (cherry picked from commit 2424589) * update sysroots (cherry picked from commit b5ea653) * chore: bump chromium in DEPS to 85.0.4167.1 * Take RFH as a parameter for DidUpdateFavicon/ManifestURL https://chromium-review.googlesource.com/c/chromium/src/+/2224745 (cherry picked from commit ad40668) * update patches * update patches * Rename net::cookie_util::StripStatuses to StripAccessResults https://chromium-review.googlesource.com/c/chromium/src/+/2212697 (cherry picked from commit bf3de1f) * use net::CookieAccessResultList instead of net::CookieAccessResultList (cherry picked from commit 400da79) * chore: bump chromium in DEPS to 85.0.4168.1 * fix mas_no_private_api patch https://chromium-review.googlesource.com/c/chromium/src/+/2230281 (cherry picked from commit 9b12714) * Update patches * fix: add new navigation state REUSE_SITE_INSTANCE To fix the new set of state checks added in https://chromium-review.googlesource.com/c/chromium/src/+/2215141 (cherry picked from commit 3a91b68) * chore: bump chromium in DEPS to 85.0.4169.1 * update patches * chore: bump chromium in DEPS to 85.0.4170.1 * chore: bump chromium in DEPS to 85.0.4171.1 * chore: bump chromium in DEPS to 85.0.4172.1 * chore: bump chromium in DEPS to 85.0.4173.1 * chore: bump chromium in DEPS to 85.0.4174.1 * chore: bump chromium in DEPS to 85.0.4175.3 * chore: bump chromium in DEPS to 85.0.4176.1 * chore: bump chromium in DEPS to 85.0.4177.2 * chore: bump chromium in DEPS to 85.0.4178.1 * chore: bump chromium in DEPS to 85.0.4178.3 * refactor: MessageLoop, you are terminated \o/ Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2246173 (cherry picked from commit 0368131) * chore: bump chromium in DEPS to 85.0.4178.4 * update patches * update lib_src_switch_buffer_kmaxlength_to_size_t.patch (cherry picked from commit c5efbdd) * [v8] Allow for 4GB TypedArrays https: //chromium-review.googlesource.com/c/v8/v8/+/2249668 (cherry picked from commit 2c1d6bf) Co-Authored-By: Robo <hop2deep@gmail.com> * Cleanup usages of old mojo types and remove unused code https://chromium-review.googlesource.com/c/chromium/src/+/2235699 (cherry picked from commit e89cb21) * refactor: plumb DownloadSchedule to DownloadItem Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2242202 (cherry picked from commit 4d549ae) * chore: fix variable typo in IPC (cherry picked from commit 7251b1e) * chore: s/BindPipeAndPassReceiver/BindNewPipeAndPassReceiver (cherry picked from commit e89bd6c) * chore: XEvent becomes x11::Event Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240355 (cherry picked from commit 4d832da) * fixup! refactor: MessageLoop, you are terminated \o/ (cherry picked from commit 902d72d) * fixup! chore: XEvent becomes x11::Event (cherry picked from commit 2704354) * chore: fix windows build (cherry picked from commit 4977098) * chore: disable SameSite-by-default changes https://chromium-review.googlesource.com/c/chromium/src/+/2231445 (cherry picked from commit d8318aa) * update printing.patch (cherry picked from commit e2037f5) * Convert WidgetHostMsg_SelectionBoundsChanged/TextInputStateChanged https://chromium-review.googlesource.com/c/chromium/src/+/2243531 (cherry picked from commit 60ff2e0) * [XProto] Replace usages of XID and ::Window with x11::Window https://chromium-review.googlesource.com/c/chromium/src/+/2249389 (cherry picked from commit 97f5b59) * Update VideoFrameMetadata to use base::Optionals https://chromium-review.googlesource.com/c/chromium/src/+/2231706 https://chromium-review.googlesource.com/c/chromium/src/+/2238361 (cherry picked from commit 4787e1f) * --disable-dev-shm-usage for gpu process crash (cherry picked from commit 207d8a3) * update patches * fixup: Cleanup usages of old mojo types and remove unused code * update patches * chore: bump chromium in DEPS to 85.0.4180.1 * build: update v8 headers (cherry picked from commit 4808975) * Update patches * fixup: build: update v8 headers * Fixup ssl_security_state_tab_helper.patch * Add missing headers * Adds icon loading service with sandbox for Windows. https://chromium-review.googlesource.com/c/chromium/src/+/1987273 * disable app.getGPUInfo spec on linux (cherry picked from commit b7ea16c) * Add missing headers for Linux and Windows * Fixup Adds icon loading service with sandbox for Windows * chore: bump chromium in DEPS to 85.0.4181.1 * update patches * Fixup: (for real) Adds icon loading service with sandbox for Windows * No more Vulkan info collection for UMA on Windows https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * extensions: Rename SharedUserScriptMaster to SharedUserScriptManager https://chromium-review.googlesource.com/c/chromium/src/+/2258357 * Add missing headers * fixup: extensions: Rename SharedUserScriptMaster to SharedUserScriptManager * fixup: No more Vulkan info collection for UMA on Windows * Add missing header * Add resource for IDS_UTILITY_PROCESS_UTILITY_WIN_NAME * fix build on windows * fix gn check Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
1 parent 86e4a96 commit 19e7af9

File tree

129 files changed

+1116
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1116
-703
lines changed

‎DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gclient_gn_args = [
1313

1414
vars = {
1515
'chromium_version':
16-
'85.0.4161.2',
16+
'85.0.4181.1',
1717
'node_version':
1818
'v12.16.3',
1919
'nan_version':

‎chromium_src/BUILD.gn

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ static_library("chrome") {
9393
]
9494
}
9595

96+
if (is_win) {
97+
sources += [
98+
"//chrome/browser/win/icon_reader_service.cc",
99+
"//chrome/browser/win/icon_reader_service.h",
100+
]
101+
public_deps += [ "//chrome/services/util_win:lib" ]
102+
}
103+
96104
if (enable_desktop_capturer) {
97105
sources += [
98106
"//chrome/browser/media/webrtc/desktop_media_list.h",

‎chromium_src/chrome/browser/process_singleton_posix.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
#include "base/logging.h"
6969
#include "base/macros.h"
7070
#include "base/memory/ref_counted.h"
71-
#include "base/message_loop/message_loop.h"
7271
#include "base/metrics/histogram_macros.h"
7372
#include "base/path_service.h"
7473
#include "base/posix/eintr_wrapper.h"

‎chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ GlobalMenuBarRegistrarX11* GlobalMenuBarRegistrarX11::GetInstance() {
2424
return base::Singleton<GlobalMenuBarRegistrarX11>::get();
2525
}
2626

27-
void GlobalMenuBarRegistrarX11::OnWindowMapped(unsigned long xid) {
28-
live_xids_.insert(xid);
27+
void GlobalMenuBarRegistrarX11::OnWindowMapped(x11::Window window) {
28+
live_windows_.insert(window);
2929

3030
if (registrar_proxy_)
31-
RegisterXID(xid);
31+
RegisterXWindow(window);
3232
}
3333

34-
void GlobalMenuBarRegistrarX11::OnWindowUnmapped(unsigned long xid) {
34+
void GlobalMenuBarRegistrarX11::OnWindowUnmapped(x11::Window window) {
3535
if (registrar_proxy_)
36-
UnregisterXID(xid);
36+
UnregisterXWindow(window);
3737

38-
live_xids_.erase(xid);
38+
live_windows_.erase(window);
3939
}
4040

4141
GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11()
@@ -63,9 +63,9 @@ GlobalMenuBarRegistrarX11::~GlobalMenuBarRegistrarX11() {
6363
}
6464
}
6565

66-
void GlobalMenuBarRegistrarX11::RegisterXID(unsigned long xid) {
66+
void GlobalMenuBarRegistrarX11::RegisterXWindow(x11::Window window) {
6767
DCHECK(registrar_proxy_);
68-
std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
68+
std::string path = electron::GlobalMenuBarX11::GetPathForWindow(window);
6969

7070
ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/314087
7171
// TODO(erg): The mozilla implementation goes to a lot of callback trouble
@@ -76,13 +76,13 @@ void GlobalMenuBarRegistrarX11::RegisterXID(unsigned long xid) {
7676
// I don't see any reason why we should care if "RegisterWindow" completes or
7777
// not.
7878
g_dbus_proxy_call(registrar_proxy_, "RegisterWindow",
79-
g_variant_new("(uo)", xid, path.c_str()),
79+
g_variant_new("(uo)", window, path.c_str()),
8080
G_DBUS_CALL_FLAGS_NONE, -1, nullptr, nullptr, nullptr);
8181
}
8282

83-
void GlobalMenuBarRegistrarX11::UnregisterXID(unsigned long xid) {
83+
void GlobalMenuBarRegistrarX11::UnregisterXWindow(x11::Window window) {
8484
DCHECK(registrar_proxy_);
85-
std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
85+
std::string path = electron::GlobalMenuBarX11::GetPathForWindow(window);
8686

8787
ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/314087
8888
// TODO(erg): The mozilla implementation goes to a lot of callback trouble
@@ -93,7 +93,7 @@ void GlobalMenuBarRegistrarX11::UnregisterXID(unsigned long xid) {
9393
// I don't see any reason why we should care if "UnregisterWindow" completes
9494
// or not.
9595
g_dbus_proxy_call(registrar_proxy_, "UnregisterWindow",
96-
g_variant_new("(u)", xid), G_DBUS_CALL_FLAGS_NONE, -1,
96+
g_variant_new("(u)", window), G_DBUS_CALL_FLAGS_NONE, -1,
9797
nullptr, nullptr, nullptr);
9898
}
9999

@@ -120,10 +120,10 @@ void GlobalMenuBarRegistrarX11::OnProxyCreated(GObject* source,
120120

121121
void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
122122
GParamSpec* /* ignored */) {
123-
// If the name owner changed, we need to reregister all the live xids with
124-
// the system.
125-
for (std::set<unsigned long>::const_iterator it = live_xids_.begin();
126-
it != live_xids_.end(); ++it) {
127-
RegisterXID(*it);
123+
// If the name owner changed, we need to reregister all the live x11::Window
124+
// with the system.
125+
for (std::set<x11::Window>::const_iterator it = live_windows_.begin();
126+
it != live_windows_.end(); ++it) {
127+
RegisterXWindow(*it);
128128
}
129129
}

‎chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@
1212
#include "base/memory/ref_counted.h"
1313
#include "base/memory/singleton.h"
1414
#include "ui/base/glib/glib_signal.h"
15+
#include "ui/gfx/x/xproto.h"
1516

1617
// Advertises our menu bars to Unity.
1718
//
1819
// GlobalMenuBarX11 is responsible for managing the DbusmenuServer for each
19-
// XID. We need a separate object to own the dbus channel to
20+
// x11::Window. We need a separate object to own the dbus channel to
2021
// com.canonical.AppMenu.Registrar and to register/unregister the mapping
21-
// between a XID and the DbusmenuServer instance we are offering.
22+
// between a x11::Window and the DbusmenuServer instance we are offering.
2223
class GlobalMenuBarRegistrarX11 {
2324
public:
2425
static GlobalMenuBarRegistrarX11* GetInstance();
2526

26-
void OnWindowMapped(unsigned long xid);
27-
void OnWindowUnmapped(unsigned long xid);
27+
void OnWindowMapped(x11::Window window);
28+
void OnWindowUnmapped(x11::Window window);
2829

2930
private:
3031
friend struct base::DefaultSingletonTraits<GlobalMenuBarRegistrarX11>;
@@ -33,8 +34,8 @@ class GlobalMenuBarRegistrarX11 {
3334
~GlobalMenuBarRegistrarX11();
3435

3536
// Sends the actual message.
36-
void RegisterXID(unsigned long xid);
37-
void UnregisterXID(unsigned long xid);
37+
void RegisterXWindow(x11::Window window);
38+
void UnregisterXWindow(x11::Window window);
3839

3940
CHROMEG_CALLBACK_1(GlobalMenuBarRegistrarX11,
4041
void,
@@ -49,9 +50,9 @@ class GlobalMenuBarRegistrarX11 {
4950

5051
GDBusProxy* registrar_proxy_;
5152

52-
// Window XIDs which want to be registered, but haven't yet been because
53+
// x11::Window which want to be registered, but haven't yet been because
5354
// we're waiting for the proxy to become available.
54-
std::set<unsigned long> live_xids_;
55+
std::set<x11::Window> live_windows_;
5556

5657
DISALLOW_COPY_AND_ASSIGN(GlobalMenuBarRegistrarX11);
5758
};

‎electron_strings.grdp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@
7575
<message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
7676
en-US,en
7777
</message>
78+
<if expr="is_win">
79+
<message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
80+
Windows Utilities
81+
</message>
82+
</if>
7883
</grit-part>

‎patches/chromium/.patches

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ chore_use_electron_resources_not_chrome_for_spellchecker.patch
7474
add_trustedauthclient_to_urlloaderfactory.patch
7575
feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
7676
accessible_pane_view.patch
77-
fixme_grit_conflicts.patch
7877
fix_use_the_new_mediaplaypause_key_listener_for_internal_chrome.patch
7978
use_electron_resources_in_pdf_util.patch
8079
hack_plugin_response_interceptor_to_point_to_electron.patch
@@ -98,6 +97,6 @@ allow_setting_secondary_label_via_simplemenumodel.patch
9897
refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
9998
disable_unnecessary_ischromefirstrun_check.patch
10099
disable_dcheck_that_fails_with_software_compositing.patch
101-
fix_default_to_ntlm_v2_in_network_service.patch
102100
fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch
103101
remove_menu_window_task_item.patch
102+
use_electron_resources_in_icon_reader_service.patch

‎patches/chromium/add_didinstallconditionalfeatures.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ DidCreateScriptContext is called, not all JS APIs are available in the
1010
context, which can cause some preload scripts to trip.
1111

1212
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
13-
index 831a3574055881f31a3e7dbc98c0525b47af5dcb..9626f181ee471fec68af7ddfc968f2d852698b74 100644
13+
index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307654d42f6 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
16-
@@ -114,6 +114,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
16+
@@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
1717
virtual void DidHandleOnloadEvents() {}
1818
virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
1919
int32_t world_id) {}
@@ -23,10 +23,10 @@ index 831a3574055881f31a3e7dbc98c0525b47af5dcb..9626f181ee471fec68af7ddfc968f2d8
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 0fe316e4d949bf2c0e64a2374a8f639e3afee104..cb612a7002a4ae808ca488e2aa2adbb759310964 100644
26+
index 5586d724ef30e8183787c1cbba21fe9741d587c5..a5a95523e16fd35018f9646ae4a4d51e5ca626c0 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4729,6 +4729,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4735,6 +4735,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index 0fe316e4d949bf2c0e64a2374a8f639e3afee104..cb612a7002a4ae808ca488e2aa2adbb7
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index c8772a65b238f52855a6634dbe1722491a663354..c856fb03735e3a46135492513e71daf3b1dc6c1a 100644
43+
index 745610204f08a39912b92f8b8ba9028465c9c57f..ddc571fbec08a38ada5c84acdadd618f1b349bed 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -724,6 +724,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -721,6 +721,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
bool ShouldTrackUseCounter(const blink::WebURL& url) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index c8772a65b238f52855a6634dbe1722491a663354..c856fb03735e3a46135492513e71daf3
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index e8286b37ae00d2cbfea0f9138ecb6532c36324fc..1c5aae1c07e0c730a0cab28dccaa5a793d41d6ac 100644
56+
index 902504b8399c53fee972fe5549a4dbd39274a3c8..ddf6b6b696f7d990b7455ac6c9b8156a733b6c07 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -547,6 +547,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -542,6 +542,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,7 +67,7 @@ index e8286b37ae00d2cbfea0f9138ecb6532c36324fc..1c5aae1c07e0c730a0cab28dccaa5a79
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
70-
index 1841d4bea144e2fe0fb69839d52ff2ba4aa6b551..64c5eb7d0da7684531b044de9d6d114fc897786e 100644
70+
index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b385bdc582 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7373
@@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() {
@@ -79,10 +79,10 @@ index 1841d4bea144e2fe0fb69839d52ff2ba4aa6b551..64c5eb7d0da7684531b044de9d6d114f
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
82-
index eae1fafbaab524e590f414b54b366a6d709fad47..97da1b1639618dded697eb72d5959926ce725e24 100644
82+
index f9d867fb84e544a2705d22c9fef1f04e639c052b..9b26988f4c7dd96269fd44c57dc9632f47ec409f 100644
8383
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
8484
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
85-
@@ -348,6 +348,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
85+
@@ -363,6 +363,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
8686
web_frame_->Client()->DidCreateScriptContext(context, world_id);
8787
}
8888

@@ -97,10 +97,10 @@ index eae1fafbaab524e590f414b54b366a6d709fad47..97da1b1639618dded697eb72d5959926
9797
v8::Local<v8::Context> context,
9898
int32_t world_id) {
9999
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
100-
index 7494f29aebe486454f35209a4a72d42dd46431a0..89f4129124b7fb01c449c51f767f4fe0dcc9c299 100644
100+
index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c70359a38 100644
101101
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
102102
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
103-
@@ -78,6 +78,8 @@ class LocalFrameClientImpl final : public LocalFrameClient {
103+
@@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
104104

105105
void DidCreateScriptContext(v8::Local<v8::Context>,
106106
int32_t world_id) override;
@@ -123,10 +123,10 @@ index a8443a8bfc2542ffad472206214279c1223d493f..8c7a4dec19d6fbca615b7bc282b03881
123123
int32_t world_id) = 0;
124124
virtual bool AllowScriptExtensions() = 0;
125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index 7f060dbe946a6df2d4e4f376512679390edadc07..435882fafb3e08b94424e812ee825e7a042dfef3 100644
126+
index a3797ca04ff968d67ce4c5da6b9f17abc1d7651d..e3f26a61cdc4042131ea58d744a9b487dd6f52ca 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -334,6 +334,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -336,6 +336,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/add_realloc.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ when we override ReallocateBufferMemory, so we therefore need to implement
1212
Realloc on the v8 side and correspondingly in gin.
1313

1414
diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
15-
index 891a2e316f6c9eeda9670aaf5201ed57e5f7ba49..00ea3682f491175c6f9bea727de120f5f0de3dac 100644
15+
index 124c2f72a5cbc2abe8c7686c32b61718d4c95d4b..fa4a478450cc97d231496ab82c74c1a94d1f3557 100644
1616
--- a/gin/array_buffer.cc
1717
+++ b/gin/array_buffer.cc
1818
@@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
@@ -54,10 +54,10 @@ index fa88b2bd0233a4c5ff35a26d10e20fa1b91e33b2..21504ce01403d20067c8439c0c61ee0d
5454
ArrayBufferContents::FreeMemory(data);
5555
}
5656
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
57-
index fe4485a34797c93dba0626356716d729f223d905..65cf74482128d84a0b955af49bf83d7c097b4af1 100644
57+
index 5026ce05c5eb0be037ce4085488eb473828175a5..639173c18ddb743a4abe650cefdd94d257437262 100644
5858
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
5959
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
60-
@@ -129,6 +129,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
60+
@@ -128,6 +128,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
6161
return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
6262
}
6363

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ WebContents, and cancels the authentication if there's no WebContents
1010
available, which there isn't in the case of the 'net' module.
1111

1212
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
13-
index 2001e6202cf61d1c70bf81334b62d0502ea8c9ba..9dad884c877ae77d1a2460361112903c06023021 100644
13+
index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec770832178 100644
1414
--- a/services/network/public/mojom/network_context.mojom
1515
+++ b/services/network/public/mojom/network_context.mojom
16-
@@ -198,6 +198,25 @@ struct CTPolicy {
16+
@@ -214,6 +214,25 @@ struct CTPolicy {
1717
array<string> excluded_legacy_spkis;
1818
};
1919

@@ -39,7 +39,7 @@ index 2001e6202cf61d1c70bf81334b62d0502ea8c9ba..9dad884c877ae77d1a2460361112903c
3939
interface CertVerifierClient {
4040
Verify(
4141
int32 default_error,
42-
@@ -627,6 +646,8 @@ struct URLLoaderFactoryParams {
42+
@@ -640,6 +659,8 @@ struct URLLoaderFactoryParams {
4343
// impact because of the extra process hops, so use should be minimized.
4444
pending_remote<TrustedURLLoaderHeaderClient>? header_client;
4545

@@ -49,7 +49,7 @@ index 2001e6202cf61d1c70bf81334b62d0502ea8c9ba..9dad884c877ae77d1a2460361112903c
4949
// the per-context allow patterns that is managed via NetworkContext
5050
// interface. This still respects the per-context block lists.
5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index 5d984482a2e5e18216bfc2229a18a513558dbcf4..1662f0878df16639ad585694be428058ab5a6c92 100644
52+
index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fbd24e112d 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
5555
@@ -437,6 +437,7 @@ URLLoader::URLLoader(
@@ -60,7 +60,7 @@ index 5d984482a2e5e18216bfc2229a18a513558dbcf4..1662f0878df16639ad585694be428058
6060
mojom::OriginPolicyManager* origin_policy_manager,
6161
std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory,
6262
mojo::PendingRemote<mojom::CookieAccessObserver> cookie_observer)
63-
@@ -496,6 +497,11 @@ URLLoader::URLLoader(
63+
@@ -497,6 +498,11 @@ URLLoader::URLLoader(
6464
header_client_.set_disconnect_handler(
6565
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
6666
}
@@ -72,16 +72,16 @@ index 5d984482a2e5e18216bfc2229a18a513558dbcf4..1662f0878df16639ad585694be428058
7272
if (want_raw_headers_) {
7373
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
7474
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
75-
@@ -994,7 +1000,7 @@ void URLLoader::OnReceivedRedirect(net::URLRequest* url_request,
76-
77-
void URLLoader::OnAuthRequired(net::URLRequest* url_request,
78-
const net::AuthChallengeInfo& auth_info) {
75+
@@ -1016,7 +1022,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
76+
// |this| may have been deleted.
77+
return;
78+
}
7979
- if (!network_context_client_) {
8080
+ if (!network_context_client_ && !auth_client_) {
8181
OnAuthCredentials(base::nullopt);
8282
return;
8383
}
84-
@@ -1010,11 +1016,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
84+
@@ -1032,11 +1038,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
8585
if (url_request->response_headers())
8686
head->headers = url_request->response_headers();
8787
head->auth_challenge_info = auth_info;
@@ -108,7 +108,7 @@ index 5d984482a2e5e18216bfc2229a18a513558dbcf4..1662f0878df16639ad585694be428058
108108
auth_challenge_responder_receiver_.set_disconnect_handler(
109109
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
110110
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
111-
index 077344d12f001b00590598bccbba2d614c8c1af2..d9c8a41c9c4fe11277392dd428c71f022f22063b 100644
111+
index f5436f10a312c713e95fac4670eab3edf048a742..02212de14459ee6cd15492e7b35cd2791f48205c 100644
112112
--- a/services/network/url_loader.h
113113
+++ b/services/network/url_loader.h
114114
@@ -115,6 +115,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
@@ -119,7 +119,7 @@ index 077344d12f001b00590598bccbba2d614c8c1af2..d9c8a41c9c4fe11277392dd428c71f02
119119
mojom::OriginPolicyManager* origin_policy_manager,
120120
std::unique_ptr<TrustTokenRequestHelperFactory>
121121
trust_token_helper_factory,
122-
@@ -454,6 +455,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
122+
@@ -456,6 +457,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
123123
base::Optional<base::UnguessableToken> fetch_window_id_;
124124

125125
mojo::Remote<mojom::TrustedHeaderClient> header_client_;

0 commit comments

Comments
 (0)