chore: bump chromium to 116.0.5829.0 (main) (#38726)
* chore: bump chromium in DEPS to 116.0.5823.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5825.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5827.0 * chore: update patches * 4568811: Integrate Search Prefetch with Extensions. https://chromium-review.googlesource.com/c/chromium/src/+/4568811 * 4567511: [DevTools] Add recordCountHistogram API. https://chromium-review.googlesource.com/c/chromium/src/+/4567511 * 4507692: Delete base/guid.h https://chromium-review.googlesource.com/c/chromium/src/+/4507692 * 4589551: Convert some of /base to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4589551 Also: 4601769: Convert immersive mode controllers to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4601769 * [viz] Convert MaybeSizeInBytes() to take in SharedImageFormat https://chromium-review.googlesource.com/c/chromium/src/+/4594677 * 4564108: [BRP] Enable check_raw_ptr_fields for Mac https://chromium-review.googlesource.com/c/chromium/src/+/4564108 * chore: bump chromium in DEPS to 116.0.5828.0 * chore: bump chromium in DEPS to 116.0.5829.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
678d1aa37d
commit
80a3ba5c68
66 changed files with 275 additions and 235 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'116.0.5815.0',
|
'116.0.5829.0',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v18.16.0',
|
'v18.16.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -67,7 +67,7 @@ index 93acf68fbb7ff9b3bfc414a33fa1cdda4fe73bb1..90ec3437c2c94e87cfd0b25b200729c1
|
||||||
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
|
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
|
||||||
int32_t world_id) {}
|
int32_t world_id) {}
|
||||||
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
|
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
|
||||||
index 62b35b9fa47f0b99f2b7b6bc712b3a4b2c1c8e4e..4a0fdbb120edc76647560fb86d95613c95ae7094 100644
|
index 1cada05806cb35a82822507f708d43979d97de61..f8e063397b161b7501308945a7df9fb89ea7d165 100644
|
||||||
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
|
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
|
||||||
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
|
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
|
||||||
@@ -198,6 +198,7 @@ void LocalWindowProxy::Initialize() {
|
@@ -198,6 +198,7 @@ void LocalWindowProxy::Initialize() {
|
||||||
|
@ -79,10 +79,10 @@ index 62b35b9fa47f0b99f2b7b6bc712b3a4b2c1c8e4e..4a0fdbb120edc76647560fb86d95613c
|
||||||
if (World().IsMainWorld()) {
|
if (World().IsMainWorld()) {
|
||||||
probe::DidCreateMainWorldContext(GetFrame());
|
probe::DidCreateMainWorldContext(GetFrame());
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
|
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
|
||||||
index 6068419926ed24e8269905c7cfe89c429071fb9c..d48eb2cec03dd3186377d23b0e93097719ab0298 100644
|
index fb229297df448dbe48e5b0ef2978bce2a8affc83..892d971c749b5bf7499c2fc246bc9d5fe5b63b79 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
|
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
|
||||||
@@ -321,6 +321,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
|
@@ -319,6 +319,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
|
||||||
|
|
||||||
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
|
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
|
||||||
int32_t world_id) = 0;
|
int32_t world_id) = 0;
|
||||||
|
@ -92,7 +92,7 @@ index 6068419926ed24e8269905c7cfe89c429071fb9c..d48eb2cec03dd3186377d23b0e930977
|
||||||
int32_t world_id) = 0;
|
int32_t world_id) = 0;
|
||||||
virtual bool AllowScriptExtensions() = 0;
|
virtual bool AllowScriptExtensions() = 0;
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
||||||
index feed61542c8cd66744c1fbc0ba412879f3696035..1bf7b85147499b185189eab49bd6e2786751c0b1 100644
|
index fa8c26e31341b2b53879a8760ad8314a569374c6..76ba9e3761d85acdaeeb017f52e24efc3d40e9b7 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
||||||
@@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
|
@@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
|
||||||
|
@ -110,7 +110,7 @@ index feed61542c8cd66744c1fbc0ba412879f3696035..1bf7b85147499b185189eab49bd6e278
|
||||||
v8::Local<v8::Context> context,
|
v8::Local<v8::Context> context,
|
||||||
int32_t world_id) {
|
int32_t world_id) {
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
||||||
index 8ea11a5c27365a234cae9ec00eaa83ad2d2aa69a..3d2eed6318fe899e1b7e9625c7b3e2781aa2e65d 100644
|
index 9f6a7e8337a4ade6b902d36919bee58f5e461790..9a73f4ceb6111b7e8bcb607b4e8eb96ebbfb0d42 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
||||||
@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
|
@@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
|
||||||
|
@ -123,10 +123,10 @@ index 8ea11a5c27365a234cae9ec00eaa83ad2d2aa69a..3d2eed6318fe899e1b7e9625c7b3e278
|
||||||
int32_t world_id) override;
|
int32_t world_id) override;
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
|
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
|
||||||
index bd4592a4f10d1370c72caf5c153cf831d5a55d7b..cc4d49cb14f5b259777a9b8023388175825ce8cf 100644
|
index 6b695ab181bc7e8a8b6ecb48ca56145ddc63d6e8..4955c7246498139a20be290a48eee234de44530e 100644
|
||||||
--- a/third_party/blink/renderer/core/loader/empty_clients.h
|
--- a/third_party/blink/renderer/core/loader/empty_clients.h
|
||||||
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
|
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
|
||||||
@@ -403,6 +403,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
|
@@ -401,6 +401,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
|
||||||
|
|
||||||
void DidCreateScriptContext(v8::Local<v8::Context>,
|
void DidCreateScriptContext(v8::Local<v8::Context>,
|
||||||
int32_t world_id) override {}
|
int32_t world_id) override {}
|
||||||
|
|
|
@ -84,10 +84,10 @@ index 8a18ecf567cd3a6a2fb1627083a5544a93198bf4..6bb4074e033e045de164bc776f75f152
|
||||||
// Visibility -----------------------------------------------------------
|
// Visibility -----------------------------------------------------------
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index ec75fb7adcd7f1b39ded29df61dbcb060798becc..0576934b9f747ab731ab1fe52c7d02882949e227 100644
|
index 3fd94156edd9868f0d46746227ae40da604bbc2c..ce99c90306bf2988fdb9a92e04d2ed8ec318da78 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -3833,13 +3833,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
@@ -3847,13 +3847,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
||||||
return GetPage()->GetPageScheduler();
|
return GetPage()->GetPageScheduler();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ index 73bdc6d0788463ef7a8656e8902fde62cbbb5464..7d49d9928fcbb23361a63eb458d6841e
|
||||||
return items_[ValidateItemIndex(index)].minor_text;
|
return items_[ValidateItemIndex(index)].minor_text;
|
||||||
}
|
}
|
||||||
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
|
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
|
||||||
index 11dde7dde3fb3bd2f61cacb4a11e33a3d2a90e0c..56ec74ee34397ce09248687e196400ed254d811c 100644
|
index 5ffe7891e71c24a0f31f758c1f467eff645bb658..7c4d37c8b05c64866bc41b38596ffb06e16d69f4 100644
|
||||||
--- a/ui/base/models/simple_menu_model.h
|
--- a/ui/base/models/simple_menu_model.h
|
||||||
+++ b/ui/base/models/simple_menu_model.h
|
+++ b/ui/base/models/simple_menu_model.h
|
||||||
@@ -50,6 +50,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
@@ -50,6 +50,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
||||||
|
@ -76,7 +76,7 @@ index 11dde7dde3fb3bd2f61cacb4a11e33a3d2a90e0c..56ec74ee34397ce09248687e196400ed
|
||||||
std::u16string GetMinorTextAt(size_t index) const override;
|
std::u16string GetMinorTextAt(size_t index) const override;
|
||||||
ImageModel GetMinorIconAt(size_t index) const override;
|
ImageModel GetMinorIconAt(size_t index) const override;
|
||||||
bool IsItemDynamicAt(size_t index) const override;
|
bool IsItemDynamicAt(size_t index) const override;
|
||||||
@@ -247,6 +252,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
@@ -246,6 +251,7 @@ class COMPONENT_EXPORT(UI_BASE) SimpleMenuModel : public MenuModel {
|
||||||
int command_id = 0;
|
int command_id = 0;
|
||||||
ItemType type = TYPE_COMMAND;
|
ItemType type = TYPE_COMMAND;
|
||||||
std::u16string label;
|
std::u16string label;
|
||||||
|
|
|
@ -49,10 +49,10 @@ index 22c4d4e9718a503d9c7ca26a40c97149b0f8986a..6bdc2757c96a28022fda9e6f5e3b74a0
|
||||||
// its owning reference back to our owning LocalFrame.
|
// its owning reference back to our owning LocalFrame.
|
||||||
client_->Detached(type);
|
client_->Detached(type);
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index e49e7e8079d525e94d7063ed8613056b59e2d873..0ea3c6c8b4a718821ea5dd40cb9239114207216d 100644
|
index e3cdbd21494ca8dafef40ef1e2561eb2dc36ef15..10c969ab87be91f01b5ea5aca267a22551df621e 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -636,10 +636,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -638,10 +638,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
}
|
}
|
||||||
DCHECK(!view_ || !view_->IsAttached());
|
DCHECK(!view_ || !view_->IsAttached());
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ index e49e7e8079d525e94d7063ed8613056b59e2d873..0ea3c6c8b4a718821ea5dd40cb923911
|
||||||
if (!Client())
|
if (!Client())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -687,6 +683,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -689,6 +685,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
DCHECK(!view_->IsAttached());
|
DCHECK(!view_->IsAttached());
|
||||||
Client()->WillBeDetached();
|
Client()->WillBeDetached();
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
|
||||||
to introduce a new Electron category for Electron-specific tracing.
|
to introduce a new Electron category for Electron-specific tracing.
|
||||||
|
|
||||||
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
|
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
|
||||||
index d2cfdefd0d381247b9e257176bb85193e3ceed49..6b56429758776296c789f0f0fa29ee4f0034f452 100644
|
index 32d4063e9cbbc917cd57db41729fc6e15803d01f..fd054d5f8ea223355423918318c437d133f73bf9 100644
|
||||||
--- a/base/trace_event/builtin_categories.h
|
--- a/base/trace_event/builtin_categories.h
|
||||||
+++ b/base/trace_event/builtin_categories.h
|
+++ b/base/trace_event/builtin_categories.h
|
||||||
@@ -80,6 +80,8 @@
|
@@ -80,6 +80,8 @@
|
||||||
|
|
|
@ -33,10 +33,10 @@ index 884bccba58c66861b43b3b50a7535cba543302e2..82e7bf534aa6b998cee8df53be3ca7db
|
||||||
"//base",
|
"//base",
|
||||||
"//build:branding_buildflags",
|
"//build:branding_buildflags",
|
||||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||||
index 5c981e6cfa75c311d0e7a8a155f16e6483396cc1..c9a7ba1796e07f5eb7a5d0ca47670f645f363cda 100644
|
index e89c9c045dd0dad908d2f1cbea8e329f58b6528c..a87b3b75f355ae577df20bd34cd012bcc3e9e11f 100644
|
||||||
--- a/chrome/browser/BUILD.gn
|
--- a/chrome/browser/BUILD.gn
|
||||||
+++ b/chrome/browser/BUILD.gn
|
+++ b/chrome/browser/BUILD.gn
|
||||||
@@ -4587,7 +4587,7 @@ static_library("browser") {
|
@@ -4590,7 +4590,7 @@ static_library("browser") {
|
||||||
|
|
||||||
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
|
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
|
||||||
# than here in :chrome_dll.
|
# than here in :chrome_dll.
|
||||||
|
@ -46,10 +46,10 @@ index 5c981e6cfa75c311d0e7a8a155f16e6483396cc1..c9a7ba1796e07f5eb7a5d0ca47670f64
|
||||||
sources += [ "certificate_viewer_stub.cc" ]
|
sources += [ "certificate_viewer_stub.cc" ]
|
||||||
}
|
}
|
||||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||||
index 94d59dba4df39f5b8fac141210e47574452df944..5c7a1739cf172c00dcb6c73574cb3619948b585b 100644
|
index 0ccf6947c9fd1aa76cb2d1eedf1c4936318d2851..6f9ec7930884b53cf05c33e143ba4096888a822e 100644
|
||||||
--- a/chrome/test/BUILD.gn
|
--- a/chrome/test/BUILD.gn
|
||||||
+++ b/chrome/test/BUILD.gn
|
+++ b/chrome/test/BUILD.gn
|
||||||
@@ -6595,7 +6595,6 @@ test("unit_tests") {
|
@@ -6634,7 +6634,6 @@ test("unit_tests") {
|
||||||
|
|
||||||
deps += [
|
deps += [
|
||||||
"//chrome:other_version",
|
"//chrome:other_version",
|
||||||
|
@ -57,7 +57,7 @@ index 94d59dba4df39f5b8fac141210e47574452df944..5c7a1739cf172c00dcb6c73574cb3619
|
||||||
"//chrome//services/util_win:unit_tests",
|
"//chrome//services/util_win:unit_tests",
|
||||||
"//chrome/app:chrome_dll_resources",
|
"//chrome/app:chrome_dll_resources",
|
||||||
"//chrome/app:win_unit_tests",
|
"//chrome/app:win_unit_tests",
|
||||||
@@ -6621,6 +6620,10 @@ test("unit_tests") {
|
@@ -6660,6 +6659,10 @@ test("unit_tests") {
|
||||||
"//ui/resources",
|
"//ui/resources",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ index 94d59dba4df39f5b8fac141210e47574452df944..5c7a1739cf172c00dcb6c73574cb3619
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
|
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
|
||||||
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
|
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
|
||||||
@@ -7543,7 +7546,6 @@ test("unit_tests") {
|
@@ -7587,7 +7590,6 @@ test("unit_tests") {
|
||||||
}
|
}
|
||||||
|
|
||||||
deps += [
|
deps += [
|
||||||
|
@ -76,7 +76,7 @@ index 94d59dba4df39f5b8fac141210e47574452df944..5c7a1739cf172c00dcb6c73574cb3619
|
||||||
"//chrome/browser/apps:icon_standardizer",
|
"//chrome/browser/apps:icon_standardizer",
|
||||||
"//chrome/browser/apps/app_service",
|
"//chrome/browser/apps/app_service",
|
||||||
"//chrome/browser/apps/app_service:test_support",
|
"//chrome/browser/apps/app_service:test_support",
|
||||||
@@ -7629,6 +7631,10 @@ test("unit_tests") {
|
@@ -7673,6 +7675,10 @@ test("unit_tests") {
|
||||||
"//ui/webui/resources/js/browser_command:mojo_bindings",
|
"//ui/webui/resources/js/browser_command:mojo_bindings",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,18 @@ Subject: build: only use the mas build config in the required components
|
||||||
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
|
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
|
||||||
|
|
||||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||||
index 8cd7358cd054324b2527da4d3928e88db4498952..6d98aa0990f66a07be975f29b58b7b4de68edca3 100644
|
index 83cdc61ae5ac4b98fc1d68ad99672606c75ddd09..0ca6f56c642f7874d1acdf6aae94a5e090d94afd 100644
|
||||||
--- a/base/BUILD.gn
|
--- a/base/BUILD.gn
|
||||||
+++ b/base/BUILD.gn
|
+++ b/base/BUILD.gn
|
||||||
@@ -1059,6 +1059,7 @@ component("base") {
|
@@ -228,6 +228,7 @@ if (is_apple) {
|
||||||
|
]
|
||||||
|
defines = [ "BASE_IMPLEMENTATION" ]
|
||||||
|
configs += [ "//build/config/compiler:enable_arc" ]
|
||||||
|
+ configs += [ "//electron/build/config:mas_build" ]
|
||||||
|
deps = [
|
||||||
|
"//base:base_static",
|
||||||
|
"//base/numerics:base_numerics",
|
||||||
|
@@ -1082,6 +1083,7 @@ component("base") {
|
||||||
"//build/config/compiler:prevent_unsafe_narrowing",
|
"//build/config/compiler:prevent_unsafe_narrowing",
|
||||||
"//build/config/compiler:wexit_time_destructors",
|
"//build/config/compiler:wexit_time_destructors",
|
||||||
"//build/config/compiler:wglobal_constructors",
|
"//build/config/compiler:wglobal_constructors",
|
||||||
|
@ -43,10 +51,18 @@ index a20e1b68ebd112d66ad82e5753b756218e457c9e..65c7170d1c2dbe4ecfc75c4fed92d6e7
|
||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
diff --git a/components/remote_cocoa/app_shim/BUILD.gn b/components/remote_cocoa/app_shim/BUILD.gn
|
||||||
index 4aa9876ca290df64da2036a821dfa02fb411676a..fc0a9f2089810de74a9b6d9e08272a5a54c7dee9 100644
|
index 3bc799978ea24e2f6e566dcc7f8638789e18d61d..cd8910dbc57813d41cd0fa28bb2ad61aaa014bc9 100644
|
||||||
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
--- a/components/remote_cocoa/app_shim/BUILD.gn
|
||||||
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
+++ b/components/remote_cocoa/app_shim/BUILD.gn
|
||||||
@@ -16,6 +16,7 @@ component("app_shim") {
|
@@ -17,6 +17,7 @@ source_set("app_shim_arc") {
|
||||||
|
configs += [
|
||||||
|
":app_shim_warnings",
|
||||||
|
"//build/config/compiler:enable_arc",
|
||||||
|
+ "//electron/build/config:mas_build"
|
||||||
|
]
|
||||||
|
sources = [
|
||||||
|
"immersive_mode_controller.h",
|
||||||
|
@@ -56,6 +57,7 @@ component("app_shim") {
|
||||||
assert(is_mac)
|
assert(is_mac)
|
||||||
|
|
||||||
configs += [ ":app_shim_warnings" ]
|
configs += [ ":app_shim_warnings" ]
|
||||||
|
@ -55,7 +71,7 @@ index 4aa9876ca290df64da2036a821dfa02fb411676a..fc0a9f2089810de74a9b6d9e08272a5a
|
||||||
"alert.h",
|
"alert.h",
|
||||||
"alert.mm",
|
"alert.mm",
|
||||||
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
||||||
index 9551e3ea2e5f3de9bff158fc0f443df69a27f93a..e8c192bfbe5a2688e8c767443edbe7fb573ed509 100644
|
index 4793d5bc9de9a3a158f90e0432c32c4818bcef2e..c42793c782c13a62b6205d0ed555ad5abab16197 100644
|
||||||
--- a/components/viz/service/BUILD.gn
|
--- a/components/viz/service/BUILD.gn
|
||||||
+++ b/components/viz/service/BUILD.gn
|
+++ b/components/viz/service/BUILD.gn
|
||||||
@@ -332,6 +332,7 @@ viz_component("service") {
|
@@ -332,6 +332,7 @@ viz_component("service") {
|
||||||
|
@ -76,7 +92,7 @@ index 9551e3ea2e5f3de9bff158fc0f443df69a27f93a..e8c192bfbe5a2688e8c767443edbe7fb
|
||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index 1af36377e3841270ddb5db056b17710aa890a3c8..8c84f972e413911bc9f4c907619d4c1599b782d2 100644
|
index 3177185f3adfd2bbb6ca6c6c8fdabde4cb90e839..7ccb4ecd7c9d9fb4106e15812f191b65eb8c03ac 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -56,6 +56,7 @@ source_set("browser") {
|
@@ -56,6 +56,7 @@ source_set("browser") {
|
||||||
|
@ -112,10 +128,10 @@ index abf8aa4dcf498f9684c10fbbe85547040029401a..6a3897cb80071cf9cdd0ee035a7ade26
|
||||||
|
|
||||||
public_deps = [
|
public_deps = [
|
||||||
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
|
||||||
index b55ea68805100e3926785e10532f27c45c13270a..34afde50788ff285b74c51eb6f5607417fe43407 100644
|
index 6709d1b96a1a92142f257911eaf546aa4954e935..e9d5318bceb63fe91811f4e04570bfc0efa23760 100644
|
||||||
--- a/content/test/BUILD.gn
|
--- a/content/test/BUILD.gn
|
||||||
+++ b/content/test/BUILD.gn
|
+++ b/content/test/BUILD.gn
|
||||||
@@ -474,6 +474,7 @@ static_library("test_support") {
|
@@ -477,6 +477,7 @@ static_library("test_support") {
|
||||||
configs += [
|
configs += [
|
||||||
"//build/config:precompiled_headers",
|
"//build/config:precompiled_headers",
|
||||||
"//v8:external_startup_data",
|
"//v8:external_startup_data",
|
||||||
|
@ -214,10 +230,10 @@ index 5e9fc18352d1bf0939f8366d2282b49aeb307994..69dcc2cafa27b3d8bdf3fe8d0a22a980
|
||||||
|
|
||||||
source_set("sandbox_unittests") {
|
source_set("sandbox_unittests") {
|
||||||
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
|
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
|
||||||
index 2c9080001cf8e8b4da54a4744f6754e3d5aac5a0..e08a38e5f9ea9c15fc5ceba1a38af682055389b7 100644
|
index db6a4b6a75ed36008128dbcadbe99397483d9566..1910ace5b6acc27c8c215a0f481ac8a6b327ac06 100644
|
||||||
--- a/third_party/blink/renderer/core/BUILD.gn
|
--- a/third_party/blink/renderer/core/BUILD.gn
|
||||||
+++ b/third_party/blink/renderer/core/BUILD.gn
|
+++ b/third_party/blink/renderer/core/BUILD.gn
|
||||||
@@ -304,6 +304,7 @@ component("core") {
|
@@ -308,6 +308,7 @@ component("core") {
|
||||||
configs -= core_config_remove
|
configs -= core_config_remove
|
||||||
configs += core_config_add
|
configs += core_config_add
|
||||||
configs += [ "//v8:external_startup_data" ]
|
configs += [ "//v8:external_startup_data" ]
|
||||||
|
@ -239,10 +255,10 @@ index 7637db0ce03b9e8d242e47f5aff85c21967a541f..e66fdb98adb035a917942432806e0dfa
|
||||||
sources += [ "ca_layer_frame_sink_provider.h" ]
|
sources += [ "ca_layer_frame_sink_provider.h" ]
|
||||||
}
|
}
|
||||||
diff --git a/ui/accessibility/platform/BUILD.gn b/ui/accessibility/platform/BUILD.gn
|
diff --git a/ui/accessibility/platform/BUILD.gn b/ui/accessibility/platform/BUILD.gn
|
||||||
index 7b3d41de1be2425929df590526082a5f45aaba9a..500b59ba38ef1dda1851443b774fa9c375aabcef 100644
|
index cb282e3a526fb724b25c0d4c6a2af3da30ee0a20..d4275f68211f5a0cddfd2bcbc0f620e8f8b6c7aa 100644
|
||||||
--- a/ui/accessibility/platform/BUILD.gn
|
--- a/ui/accessibility/platform/BUILD.gn
|
||||||
+++ b/ui/accessibility/platform/BUILD.gn
|
+++ b/ui/accessibility/platform/BUILD.gn
|
||||||
@@ -252,6 +252,7 @@ component("platform") {
|
@@ -247,6 +247,7 @@ component("platform") {
|
||||||
weak_frameworks = [
|
weak_frameworks = [
|
||||||
"Accessibility.framework", # macOS 11
|
"Accessibility.framework", # macOS 11
|
||||||
]
|
]
|
||||||
|
@ -251,7 +267,7 @@ index 7b3d41de1be2425929df590526082a5f45aaba9a..500b59ba38ef1dda1851443b774fa9c3
|
||||||
|
|
||||||
if (use_atk) {
|
if (use_atk) {
|
||||||
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
||||||
index 260725d466d890dfec29d423700510f55caa7a52..f98598cf97a740b39016b35ca12825eefd1c1a07 100644
|
index 4de874f3d12be434ea7f7f9737077a37cd11dc4c..78281df1de98e25a3d73471fc2f57699cf48e5d4 100644
|
||||||
--- a/ui/base/BUILD.gn
|
--- a/ui/base/BUILD.gn
|
||||||
+++ b/ui/base/BUILD.gn
|
+++ b/ui/base/BUILD.gn
|
||||||
@@ -355,6 +355,7 @@ component("base") {
|
@@ -355,6 +355,7 @@ component("base") {
|
||||||
|
@ -278,7 +294,7 @@ index 4fb4a862d285fababc67d4f2fe38036ea83bd8a9..fa71bc82342412d85fb05312b441cecb
|
||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
|
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
|
||||||
index f8dfc00b61d67aec62f26b57636b28dcfca8f989..bf067319394717738f5281a28bcbdaab8d8f3ead 100644
|
index ac1875a96d3d877a81b0f26c6a18036e0674c590..d4d74d3bee9be3735ca3245c8a9b0d06c8f82eca 100644
|
||||||
--- a/ui/gfx/BUILD.gn
|
--- a/ui/gfx/BUILD.gn
|
||||||
+++ b/ui/gfx/BUILD.gn
|
+++ b/ui/gfx/BUILD.gn
|
||||||
@@ -192,6 +192,7 @@ component("gfx") {
|
@@ -192,6 +192,7 @@ component("gfx") {
|
||||||
|
@ -290,10 +306,10 @@ index f8dfc00b61d67aec62f26b57636b28dcfca8f989..bf067319394717738f5281a28bcbdaab
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
sources += [
|
sources += [
|
||||||
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
|
||||||
index 416497c77970e1c15ebecc27af59cf50112a6441..b366bbb8d84c6c7fb1a3b9b1b1e022d5de077b2d 100644
|
index 146d5428d9ab82da74a427ee9ac05258e23d681d..ba6b43d205145e3bae0f094ecdaa0cebda3e0a66 100644
|
||||||
--- a/ui/views/BUILD.gn
|
--- a/ui/views/BUILD.gn
|
||||||
+++ b/ui/views/BUILD.gn
|
+++ b/ui/views/BUILD.gn
|
||||||
@@ -681,6 +681,7 @@ component("views") {
|
@@ -680,6 +680,7 @@ component("views") {
|
||||||
"IOSurface.framework",
|
"IOSurface.framework",
|
||||||
"QuartzCore.framework",
|
"QuartzCore.framework",
|
||||||
]
|
]
|
||||||
|
@ -301,7 +317,7 @@ index 416497c77970e1c15ebecc27af59cf50112a6441..b366bbb8d84c6c7fb1a3b9b1b1e022d5
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
@@ -1097,6 +1098,8 @@ source_set("test_support") {
|
@@ -1096,6 +1097,8 @@ source_set("test_support") {
|
||||||
"//testing/gtest",
|
"//testing/gtest",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -311,7 +327,7 @@ index 416497c77970e1c15ebecc27af59cf50112a6441..b366bbb8d84c6c7fb1a3b9b1b1e022d5
|
||||||
sources += [
|
sources += [
|
||||||
"test/desktop_window_tree_host_win_test_api.cc",
|
"test/desktop_window_tree_host_win_test_api.cc",
|
||||||
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
|
diff --git a/ui/views/controls/webview/BUILD.gn b/ui/views/controls/webview/BUILD.gn
|
||||||
index 7462baf7cfae6859a821b71501b60015ff2c4ed7..1eeacfc6bf7fd3a42a06198045260519bf606a48 100644
|
index e3dd4fab3a1cac0138f8dac60247e0ea3343e87e..61ce57a66ec9d686816446c7f05ce82ee7ee442e 100644
|
||||||
--- a/ui/views/controls/webview/BUILD.gn
|
--- a/ui/views/controls/webview/BUILD.gn
|
||||||
+++ b/ui/views/controls/webview/BUILD.gn
|
+++ b/ui/views/controls/webview/BUILD.gn
|
||||||
@@ -19,6 +19,7 @@ component("webview") {
|
@@ -19,6 +19,7 @@ component("webview") {
|
||||||
|
|
|
@ -9,10 +9,10 @@ potentially prevent a window from being created.
|
||||||
TODO(loc): this patch is currently broken.
|
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
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index e6afcce7a20db58380478f855bd559ee5d5d3098..3c2d6925829ef571949ee13234ddac23603950f5 100644
|
index f20506297fc2629c186aa780b0f1ff6f74fdd90e..055b0bd53fea17e1df96f460aede20497d53216f 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -7824,6 +7824,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -7825,6 +7825,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
last_committed_origin_, params->window_container_type,
|
last_committed_origin_, params->window_container_type,
|
||||||
params->target_url, params->referrer.To<Referrer>(),
|
params->target_url, params->referrer.To<Referrer>(),
|
||||||
params->frame_name, params->disposition, *params->features,
|
params->frame_name, params->disposition, *params->features,
|
||||||
|
@ -21,10 +21,10 @@ index e6afcce7a20db58380478f855bd559ee5d5d3098..3c2d6925829ef571949ee13234ddac23
|
||||||
&no_javascript_access);
|
&no_javascript_access);
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 6a4120f593663551f7ea26d6729e06b1f7f8bc35..cb5d09ff6c2347caac3c31f642be244937fdd284 100644
|
index 0a2c7372e7931e4e7b0a88c6e3ae94f4f96f7d99..fdd0eacf647dd9097bdb59ff408fcd46e078dd72 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4175,6 +4175,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4176,6 +4176,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
|
|
||||||
auto* new_contents_impl = new_contents.get();
|
auto* new_contents_impl = new_contents.get();
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ index 6a4120f593663551f7ea26d6729e06b1f7f8bc35..cb5d09ff6c2347caac3c31f642be2449
|
||||||
// If the new frame has a name, make sure any SiteInstances that can find
|
// If the new frame has a name, make sure any SiteInstances that can find
|
||||||
// this named frame have proxies for it. Must be called after
|
// this named frame have proxies for it. Must be called after
|
||||||
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
||||||
@@ -4216,12 +4222,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4217,12 +4223,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
AddWebContentsDestructionObserver(new_contents_impl);
|
AddWebContentsDestructionObserver(new_contents_impl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ index 033780b477965e6915fc808cb468598f55050f2b..51da4e464c5768d979188bb46c11565c
|
||||||
|
|
||||||
// Operation result when the renderer asks the browser to create a new window.
|
// 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
|
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
||||||
index 1024cfb384eceb509ede5ea0bf846ab8d31e50f2..a60292d190df0e659f96ac1ae450b49b7deb6ff8 100644
|
index 0d13c497fc6032f9a1ddc7f6a693412ec7caa9fd..05303e632953657176ddfb41add3189a3097eae2 100644
|
||||||
--- a/content/public/browser/content_browser_client.cc
|
--- a/content/public/browser/content_browser_client.cc
|
||||||
+++ b/content/public/browser/content_browser_client.cc
|
+++ b/content/public/browser/content_browser_client.cc
|
||||||
@@ -658,6 +658,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
@@ -658,6 +658,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
||||||
|
@ -79,10 +79,10 @@ index 1024cfb384eceb509ede5ea0bf846ab8d31e50f2..a60292d190df0e659f96ac1ae450b49b
|
||||||
bool opener_suppressed,
|
bool opener_suppressed,
|
||||||
bool* no_javascript_access) {
|
bool* no_javascript_access) {
|
||||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||||
index 142fc907837fc194a2c5de0b44d6598e3935eaec..624ca55fd047d68d456be85f8bc45de57c452f67 100644
|
index 659035715218eccc18d19c6fea2a282d8f71c489..cfb536c2642b21e4edf60e677bce96a506189bb5 100644
|
||||||
--- a/content/public/browser/content_browser_client.h
|
--- a/content/public/browser/content_browser_client.h
|
||||||
+++ b/content/public/browser/content_browser_client.h
|
+++ b/content/public/browser/content_browser_client.h
|
||||||
@@ -167,6 +167,7 @@ class NetworkService;
|
@@ -168,6 +168,7 @@ class NetworkService;
|
||||||
class TrustedURLLoaderHeaderClient;
|
class TrustedURLLoaderHeaderClient;
|
||||||
} // namespace mojom
|
} // namespace mojom
|
||||||
struct ResourceRequest;
|
struct ResourceRequest;
|
||||||
|
@ -90,7 +90,7 @@ index 142fc907837fc194a2c5de0b44d6598e3935eaec..624ca55fd047d68d456be85f8bc45de5
|
||||||
} // namespace network
|
} // namespace network
|
||||||
|
|
||||||
namespace sandbox {
|
namespace sandbox {
|
||||||
@@ -1067,6 +1068,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
@@ -1068,6 +1069,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||||
const std::string& frame_name,
|
const std::string& frame_name,
|
||||||
WindowOpenDisposition disposition,
|
WindowOpenDisposition disposition,
|
||||||
const blink::mojom::WindowFeatures& features,
|
const blink::mojom::WindowFeatures& features,
|
||||||
|
@ -100,7 +100,7 @@ index 142fc907837fc194a2c5de0b44d6598e3935eaec..624ca55fd047d68d456be85f8bc45de5
|
||||||
bool opener_suppressed,
|
bool opener_suppressed,
|
||||||
bool* no_javascript_access);
|
bool* no_javascript_access);
|
||||||
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
||||||
index 885899b151520e0173a5ca68c2613b1333cadddf..5b53ee691c0a07ed1655139ca2d90341b5fa55a3 100644
|
index 0e348f7ca57e3004c1f85435ecd0c66896c5a8fb..8019a5c687a87a4257f9f7c0581781095fc20043 100644
|
||||||
--- a/content/public/browser/web_contents_delegate.cc
|
--- a/content/public/browser/web_contents_delegate.cc
|
||||||
+++ b/content/public/browser/web_contents_delegate.cc
|
+++ b/content/public/browser/web_contents_delegate.cc
|
||||||
@@ -28,6 +28,17 @@ namespace content {
|
@@ -28,6 +28,17 @@ namespace content {
|
||||||
|
@ -210,10 +210,10 @@ index bef5a989bac50c177f15f52fe87ac3790d553e85..65dcd2e3b51929400c8bfb6a98a4fb59
|
||||||
|
|
||||||
} // namespace blink
|
} // namespace blink
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
index d4b693833254a9cb294c98c14cc5b0c00f7e678e..884635d65add468cfd896db7e8d8d001e79833fe 100644
|
index fb5fe0882a0e5afb8772c18a09566432fb1085d6..ec4ef8956e59e129e983a43ed286fb224a88898d 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
@@ -2202,6 +2202,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
@@ -2195,6 +2195,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
||||||
WebWindowFeatures window_features =
|
WebWindowFeatures window_features =
|
||||||
GetWindowFeaturesFromString(features, entered_window);
|
GetWindowFeaturesFromString(features, entered_window);
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ index 7141c8b3de3bc419d536499ce775d98b619a7bdb..d316050668a44ccfd033a56cd1de4901
|
||||||
/google_apis/internal
|
/google_apis/internal
|
||||||
/googleurl
|
/googleurl
|
||||||
diff --git a/third_party/.gitignore b/third_party/.gitignore
|
diff --git a/third_party/.gitignore b/third_party/.gitignore
|
||||||
index a1dd3deb87cfe5dbd451f2a1cdab576e3152535b..d3f626cee6998992f67b14108090acea17eccaf1 100644
|
index bca69adc4f735f1b142d90f37c1602069a2e9396..70fb31d3b3706e61bf37f1102f48a6fcccb35eea 100644
|
||||||
--- a/third_party/.gitignore
|
--- a/third_party/.gitignore
|
||||||
+++ b/third_party/.gitignore
|
+++ b/third_party/.gitignore
|
||||||
@@ -94,6 +94,7 @@
|
@@ -94,6 +94,7 @@
|
||||||
|
|
|
@ -218,10 +218,10 @@ index 4e32d708ecf4afd3913d86ec1602ef2dc9a60998..1dd2f50fba1387b5eeb554dd540957d7
|
||||||
void AddNewContents(content::WebContents* source,
|
void AddNewContents(content::WebContents* source,
|
||||||
std::unique_ptr<content::WebContents> new_contents,
|
std::unique_ptr<content::WebContents> new_contents,
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 8485102b60faadccbc463c8fc52499e2f865f3f9..525aee88cd77d7f5cb561a97fb79d0bfe2582176 100644
|
index 020dc08a3d8a83fe1f82e3f3ae65f2a18bd4935b..ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4082,8 +4082,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4083,8 +4083,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
|
|
||||||
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
||||||
source_site_instance, params.window_container_type,
|
source_site_instance, params.window_container_type,
|
||||||
|
@ -232,7 +232,7 @@ index 8485102b60faadccbc463c8fc52499e2f865f3f9..525aee88cd77d7f5cb561a97fb79d0bf
|
||||||
static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
|
static_cast<WebContentsImpl*>(delegate_->CreateCustomWebContents(
|
||||||
opener, source_site_instance, is_new_browsing_instance,
|
opener, source_site_instance, is_new_browsing_instance,
|
||||||
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
||||||
index 5b53ee691c0a07ed1655139ca2d90341b5fa55a3..684b2f9c1f20a2dd460491d9d4285756907a8aa4 100644
|
index 8019a5c687a87a4257f9f7c0581781095fc20043..d7ccb0f7a7b15fb19640b1b0491750b179a77693 100644
|
||||||
--- a/content/public/browser/web_contents_delegate.cc
|
--- a/content/public/browser/web_contents_delegate.cc
|
||||||
+++ b/content/public/browser/web_contents_delegate.cc
|
+++ b/content/public/browser/web_contents_delegate.cc
|
||||||
@@ -136,8 +136,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
|
@@ -136,8 +136,7 @@ bool WebContentsDelegate::IsWebContentsCreationOverridden(
|
||||||
|
|
|
@ -7,7 +7,7 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
|
||||||
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
|
to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.
|
||||||
|
|
||||||
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
|
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
|
||||||
index 93eac2b049ecfb5a7650e778ea4e243bc1ca5b4d..d19698c57ecfb808e4b255b4bc8b17429afd2013 100644
|
index 62e4947ec2974c1ef2152e78d05b2100f49e5616..2d99eb72f7b27f0e8f79c875e54ffa5cf115b533 100644
|
||||||
--- a/content/app/content_main_runner_impl.cc
|
--- a/content/app/content_main_runner_impl.cc
|
||||||
+++ b/content/app/content_main_runner_impl.cc
|
+++ b/content/app/content_main_runner_impl.cc
|
||||||
@@ -39,6 +39,7 @@
|
@@ -39,6 +39,7 @@
|
||||||
|
@ -18,7 +18,7 @@ index 93eac2b049ecfb5a7650e778ea4e243bc1ca5b4d..d19698c57ecfb808e4b255b4bc8b1742
|
||||||
#include "base/strings/string_number_conversions.h"
|
#include "base/strings/string_number_conversions.h"
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
#include "base/task/single_thread_task_runner.h"
|
#include "base/task/single_thread_task_runner.h"
|
||||||
@@ -258,8 +259,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
|
@@ -253,8 +254,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ index 93eac2b049ecfb5a7650e778ea4e243bc1ca5b4d..d19698c57ecfb808e4b255b4bc8b1742
|
||||||
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
||||||
base::FileDescriptorStore& file_descriptor_store =
|
base::FileDescriptorStore& file_descriptor_store =
|
||||||
base::FileDescriptorStore::GetInstance();
|
base::FileDescriptorStore::GetInstance();
|
||||||
@@ -288,11 +294,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
|
@@ -283,11 +289,12 @@ bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
|
||||||
|
|
||||||
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ index 93eac2b049ecfb5a7650e778ea4e243bc1ca5b4d..d19698c57ecfb808e4b255b4bc8b1742
|
||||||
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
#endif // V8_USE_EXTERNAL_STARTUP_DATA
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -966,7 +973,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
|
@@ -945,7 +952,7 @@ int ContentMainRunnerImpl::Initialize(ContentMainParams params) {
|
||||||
return TerminateForFatalInitializationError();
|
return TerminateForFatalInitializationError();
|
||||||
#endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
|
#endif // BUILDFLAG(IS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
|
||||||
|
|
||||||
|
@ -102,10 +102,10 @@ index d4bb0e9a017a833b403916e1d6e64fb058f40f86..35ba35a95e39700824d6e0b480b99bc3
|
||||||
friend class ContentClientCreator;
|
friend class ContentClientCreator;
|
||||||
friend class ContentClientInitializer;
|
friend class ContentClientInitializer;
|
||||||
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
||||||
index 0d56182a284b91e7bf5749dbf0796cbe705d2c1f..a7578102abc92cba4334459f540776dc2463cdb5 100644
|
index 5d97de5f7072054fdd57f0240c6faf0865013f3f..3c1d7f1aa7c55a5c2bd62cc85c7d17efb4311750 100644
|
||||||
--- a/gin/v8_initializer.cc
|
--- a/gin/v8_initializer.cc
|
||||||
+++ b/gin/v8_initializer.cc
|
+++ b/gin/v8_initializer.cc
|
||||||
@@ -514,8 +514,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
|
@@ -526,8 +526,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
|
||||||
|
|
||||||
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ index 0d56182a284b91e7bf5749dbf0796cbe705d2c1f..a7578102abc92cba4334459f540776dc
|
||||||
if (g_mapped_snapshot) {
|
if (g_mapped_snapshot) {
|
||||||
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
|
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
|
||||||
// files in a process.
|
// files in a process.
|
||||||
@@ -524,10 +523,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
|
@@ -536,10 +535,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
|
||||||
|
|
||||||
base::MemoryMappedFile::Region file_region;
|
base::MemoryMappedFile::Region file_region;
|
||||||
base::File file =
|
base::File file =
|
||||||
|
|
|
@ -8,7 +8,7 @@ Allow registering custom protocols to handle service worker main script fetching
|
||||||
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
|
Refs https://bugs.chromium.org/p/chromium/issues/detail?id=996511
|
||||||
|
|
||||||
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
|
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||||
index 939ea79947c6c1ae2d3d8b2d73226c89cffbdf2d..874a76e34586ab31658bac0f76835598ec003094 100644
|
index 698c94642b98b03570fef8f7a5956486eacacbdc..7983abad9a78a115dfd7b9513c6f57be2cd40811 100644
|
||||||
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
--- a/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||||
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc
|
||||||
@@ -1839,6 +1839,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
@@ -1839,6 +1839,26 @@ ServiceWorkerContextWrapper::GetLoaderFactoryForBrowserInitiatedRequest(
|
||||||
|
|
|
@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
|
||||||
https://crbug.com/634542 and https://crbug.com/711107.
|
https://crbug.com/634542 and https://crbug.com/711107.
|
||||||
|
|
||||||
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
||||||
index 5bfae3cc8319e455cab3b1e3283dd26f056e6827..38e027307c5ca9d08c4dd8e3ce6667e4eaf803b5 100644
|
index 943e3217f5327934ad27d1d7b7b2f664c2eb85ef..3dd1abc9a50a96fa7a7ce128486c7ba2e2187e12 100644
|
||||||
--- a/cc/trees/layer_tree_host_impl.cc
|
--- a/cc/trees/layer_tree_host_impl.cc
|
||||||
+++ b/cc/trees/layer_tree_host_impl.cc
|
+++ b/cc/trees/layer_tree_host_impl.cc
|
||||||
@@ -1905,6 +1905,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
|
@@ -1899,6 +1899,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
|
||||||
TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
|
TargetColorParams LayerTreeHostImpl::GetTargetColorParams(
|
||||||
gfx::ContentColorUsage content_color_usage) const {
|
gfx::ContentColorUsage content_color_usage) const {
|
||||||
TargetColorParams params;
|
TargetColorParams params;
|
||||||
|
@ -93,10 +93,10 @@ index b7df289e4546fd5d33266223f4b678c1ab0e26e2..af4fdec439ebe630d43a60cfa53d3add
|
||||||
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
|
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
|
||||||
sandbox::policy::switches::kGpuSandboxFailuresFatal,
|
sandbox::policy::switches::kGpuSandboxFailuresFatal,
|
||||||
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
index 2fe11fd6f014cb5b415efe2ae1ba97efa94281c4..b96f01c161cd71e16e3c203a19a6715a33cae2e2 100644
|
index a8573d9c486d5c3b050af7fc896f31d56222b1a2..bc4e94f23a2fbe30857a2fa5b796f1f862fbf424 100644
|
||||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
@@ -3476,6 +3476,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
@@ -3518,6 +3518,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
||||||
// Propagate the following switches to the renderer command line (along
|
// Propagate the following switches to the renderer command line (along
|
||||||
// with any associated values) if present in the browser command line.
|
// with any associated values) if present in the browser command line.
|
||||||
static const char* const kSwitchNames[] = {
|
static const char* const kSwitchNames[] = {
|
||||||
|
|
|
@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
|
||||||
|
|
||||||
} // namespace net
|
} // namespace net
|
||||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||||
index f2ae2092be6042f48d50f690581dccff8a3e2566..81f3e8a29b721d66ef786ade7fac0b0852555421 100644
|
index 0ffa0ec042bd59de5d28fad53dee2b6321d64b18..a6570cb144952a1bb7eca124bb4cbb33e249ef15 100644
|
||||||
--- a/services/network/network_context.cc
|
--- a/services/network/network_context.cc
|
||||||
+++ b/services/network/network_context.cc
|
+++ b/services/network/network_context.cc
|
||||||
@@ -1488,6 +1488,13 @@ void NetworkContext::SetNetworkConditions(
|
@@ -1491,6 +1491,13 @@ void NetworkContext::SetNetworkConditions(
|
||||||
std::move(network_conditions));
|
std::move(network_conditions));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
|
||||||
done in future work.
|
done in future work.
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index 0576934b9f747ab731ab1fe52c7d02882949e227..dec1e6be2a678ce407deec8dd30957e26e6d2ab1 100644
|
index ce99c90306bf2988fdb9a92e04d2ed8ec318da78..77f90f35ebad0655af1bd063d9a942964db48017 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -165,6 +165,7 @@
|
@@ -166,6 +166,7 @@
|
||||||
#include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
|
#include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
|
||||||
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
|
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
|
||||||
#include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
|
#include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
|
||||||
|
@ -23,7 +23,7 @@ index 0576934b9f747ab731ab1fe52c7d02882949e227..dec1e6be2a678ce407deec8dd30957e2
|
||||||
#include "third_party/blink/renderer/platform/graphics/image.h"
|
#include "third_party/blink/renderer/platform/graphics/image.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
||||||
@@ -1764,6 +1765,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
@@ -1765,6 +1766,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
web_view_impl->SetMaximumLegibleScale(
|
web_view_impl->SetMaximumLegibleScale(
|
||||||
prefs.default_maximum_page_scale_factor);
|
prefs.default_maximum_page_scale_factor);
|
||||||
|
|
|
@ -65,7 +65,7 @@ index 02d9eabfef9521722340739bf86df3dfc30018d7..af8639ebcc61d8081a12334f652a551d
|
||||||
#if BUILDFLAG(IS_WIN)
|
#if BUILDFLAG(IS_WIN)
|
||||||
bool EscapeVirtualization(const base::FilePath& user_data_dir);
|
bool EscapeVirtualization(const base::FilePath& user_data_dir);
|
||||||
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
||||||
index 5330402b1df783b8258b09d8e8dfc2cdf3819437..ab12ef7610f243f9cc0207d20fa55a133f0f85d3 100644
|
index 7cd73bf6d1884bd9b38bcb33de009efb1da2add9..a7a441a24098dc95e71e871e776e2cd8dd3c0ea2 100644
|
||||||
--- a/chrome/browser/process_singleton_posix.cc
|
--- a/chrome/browser/process_singleton_posix.cc
|
||||||
+++ b/chrome/browser/process_singleton_posix.cc
|
+++ b/chrome/browser/process_singleton_posix.cc
|
||||||
@@ -608,6 +608,7 @@ class ProcessSingleton::LinuxWatcher
|
@@ -608,6 +608,7 @@ class ProcessSingleton::LinuxWatcher
|
||||||
|
|
|
@ -26,7 +26,7 @@ index 4c60eb7caf5eddbdb71b753c710c7053476bee04..88dd58492d84c6da4f179a5ef651923a
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
|
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
|
||||||
index a337d8ff4ed81dae4455af01cc9dc72356a31f82..ca9318f403ce9e80b28b107a47f67405663e8775 100644
|
index 5ee7cd7952f7b956c32e793e251d5b0cb457026a..bc2fac2b97ffbcc4c0b54d1652c37bfb021d5d3d 100644
|
||||||
--- a/ui/native_theme/native_theme.h
|
--- a/ui/native_theme/native_theme.h
|
||||||
+++ b/ui/native_theme/native_theme.h
|
+++ b/ui/native_theme/native_theme.h
|
||||||
@@ -410,6 +410,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
@@ -410,6 +410,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
||||||
|
@ -53,7 +53,7 @@ index a337d8ff4ed81dae4455af01cc9dc72356a31f82..ca9318f403ce9e80b28b107a47f67405
|
||||||
// Returns a shared instance of the native theme that should be used for web
|
// Returns a shared instance of the native theme that should be used for web
|
||||||
// rendering. Do not use it in a normal application context (i.e. browser).
|
// rendering. Do not use it in a normal application context (i.e. browser).
|
||||||
// The returned object should not be deleted by the caller. This function is
|
// The returned object should not be deleted by the caller. This function is
|
||||||
@@ -605,6 +622,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
@@ -606,6 +623,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
||||||
PageColors page_colors_ = PageColors::kOff;
|
PageColors page_colors_ = PageColors::kOff;
|
||||||
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
|
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
|
||||||
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
|
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
|
||||||
|
@ -62,10 +62,10 @@ index a337d8ff4ed81dae4455af01cc9dc72356a31f82..ca9318f403ce9e80b28b107a47f67405
|
||||||
SEQUENCE_CHECKER(sequence_checker_);
|
SEQUENCE_CHECKER(sequence_checker_);
|
||||||
};
|
};
|
||||||
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
|
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
|
||||||
index b27c0856568c5c601976aa0593d16014a4f99dfe..5aa80492896f7b1107c974b00e5d145256cf7647 100644
|
index 87807be3558a2fdd222241b046718f9f1f0b7858..dcff51e17f5215d62c62141f2b63f26501e59d09 100644
|
||||||
--- a/ui/native_theme/native_theme_win.cc
|
--- a/ui/native_theme/native_theme_win.cc
|
||||||
+++ b/ui/native_theme/native_theme_win.cc
|
+++ b/ui/native_theme/native_theme_win.cc
|
||||||
@@ -622,6 +622,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
|
@@ -623,6 +623,8 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
|
||||||
// ...unless --force-dark-mode was specified in which case caveat emptor.
|
// ...unless --force-dark-mode was specified in which case caveat emptor.
|
||||||
if (InForcedColorsMode() && !IsForcedDarkMode())
|
if (InForcedColorsMode() && !IsForcedDarkMode())
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -59,10 +59,10 @@ index 5eeaadec9773f4890d9f8cccba1d50f645045b74..d7eb61a67c507ff8bd9e60878a9f5bbf
|
||||||
// of lacros-chrome is complete.
|
// of lacros-chrome is complete.
|
||||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
diff --git a/components/viz/host/layered_window_updater_impl.cc b/components/viz/host/layered_window_updater_impl.cc
|
diff --git a/components/viz/host/layered_window_updater_impl.cc b/components/viz/host/layered_window_updater_impl.cc
|
||||||
index 271486b45dcc87b52b3fd8a8f248b08a4918c97e..9de13bd8ea5f2efe5d0f23ab045fe0aba226cf5d 100644
|
index 8f726bde2cb5da6acfe630006af0fc3a09811d6c..45d8cae3ba0fca9a1514f83032a10c8820b3126d 100644
|
||||||
--- a/components/viz/host/layered_window_updater_impl.cc
|
--- a/components/viz/host/layered_window_updater_impl.cc
|
||||||
+++ b/components/viz/host/layered_window_updater_impl.cc
|
+++ b/components/viz/host/layered_window_updater_impl.cc
|
||||||
@@ -44,7 +44,9 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
|
@@ -46,7 +46,9 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
|
||||||
// |region|'s handle will close when it goes out of scope.
|
// |region|'s handle will close when it goes out of scope.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ index 8af69cac78b7488d28f1f05ccb174793fe5148cd..9f74e511c263d147b5fbe81fe100d217
|
||||||
private:
|
private:
|
||||||
const HWND hwnd_;
|
const HWND hwnd_;
|
||||||
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
|
||||||
index 5583233391b2133acd30d76ce4c3c5d87e0ffbc8..9551e3ea2e5f3de9bff158fc0f443df69a27f93a 100644
|
index 5c86cab93c22d54648e70d56db850a0a939403b4..4793d5bc9de9a3a158f90e0432c32c4818bcef2e 100644
|
||||||
--- a/components/viz/service/BUILD.gn
|
--- a/components/viz/service/BUILD.gn
|
||||||
+++ b/components/viz/service/BUILD.gn
|
+++ b/components/viz/service/BUILD.gn
|
||||||
@@ -141,6 +141,8 @@ viz_component("service") {
|
@@ -141,6 +141,8 @@ viz_component("service") {
|
||||||
|
@ -231,10 +231,10 @@ index e12c1d87018a86d763f59e5ac62058cf815fce3a..01f8023811b49797674a0de6e32c358d
|
||||||
|
|
||||||
diff --git a/components/viz/service/display_embedder/software_output_device_proxy.cc b/components/viz/service/display_embedder/software_output_device_proxy.cc
|
diff --git a/components/viz/service/display_embedder/software_output_device_proxy.cc b/components/viz/service/display_embedder/software_output_device_proxy.cc
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..28766c6a228d243065e363838a28b38ac2448332
|
index 0000000000000000000000000000000000000000..25c427e337a1bc049cd6977a13c4113085dc9401
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/components/viz/service/display_embedder/software_output_device_proxy.cc
|
+++ b/components/viz/service/display_embedder/software_output_device_proxy.cc
|
||||||
@@ -0,0 +1,160 @@
|
@@ -0,0 +1,161 @@
|
||||||
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||||
+// Use of this source code is governed by a BSD-style license that can be
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
+// found in the LICENSE file.
|
+// found in the LICENSE file.
|
||||||
|
@ -331,8 +331,9 @@ index 0000000000000000000000000000000000000000..28766c6a228d243065e363838a28b38a
|
||||||
+ canvas_.reset();
|
+ canvas_.reset();
|
||||||
+
|
+
|
||||||
+ size_t required_bytes;
|
+ size_t required_bytes;
|
||||||
+ if (!ResourceSizes::MaybeSizeInBytes(
|
+ if (!ResourceSizes::MaybeSizeInBytes(viewport_pixel_size_,
|
||||||
+ viewport_pixel_size_, ResourceFormat::RGBA_8888, &required_bytes)) {
|
+ SinglePlaneFormat::kRGBA_8888,
|
||||||
|
+ &required_bytes)) {
|
||||||
+ DLOG(ERROR) << "Invalid viewport size " << viewport_pixel_size_.ToString();
|
+ DLOG(ERROR) << "Invalid viewport size " << viewport_pixel_size_.ToString();
|
||||||
+ return;
|
+ return;
|
||||||
+ }
|
+ }
|
||||||
|
@ -500,10 +501,10 @@ index 0000000000000000000000000000000000000000..e1a22ee881c0fd679ac2d2d4d11a3c93
|
||||||
+
|
+
|
||||||
+#endif // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_
|
+#endif // COMPONENTS_VIZ_SERVICE_DISPLAY_EMBEDDER_SOFTWARE_OUTPUT_DEVICE_PROXY_H_
|
||||||
diff --git a/components/viz/service/display_embedder/software_output_device_win.cc b/components/viz/service/display_embedder/software_output_device_win.cc
|
diff --git a/components/viz/service/display_embedder/software_output_device_win.cc b/components/viz/service/display_embedder/software_output_device_win.cc
|
||||||
index d4d4c1444e7a169d154bb9062f09f2270e7e9734..01943e14de567afd7b14f6a92eec651df185e1bb 100644
|
index 796ae2688436eb07f19909641d1620dd02f10cdb..c9e0eee0b329caf46669b419b1cd10cf2a707ac8 100644
|
||||||
--- a/components/viz/service/display_embedder/software_output_device_win.cc
|
--- a/components/viz/service/display_embedder/software_output_device_win.cc
|
||||||
+++ b/components/viz/service/display_embedder/software_output_device_win.cc
|
+++ b/components/viz/service/display_embedder/software_output_device_win.cc
|
||||||
@@ -192,7 +192,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
|
@@ -193,7 +193,7 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
|
||||||
if (!canvas_)
|
if (!canvas_)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -555,10 +556,10 @@ index cc1ceb263a60b9bd743bd4166def23cd1c01b49f..d2c24bf0b674c5028e48c6b51f23d4a8
|
||||||
|
|
||||||
} // namespace viz
|
} // namespace viz
|
||||||
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
|
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
|
||||||
index ea2888e6e6ce03dd1918a6183960d5809a15b59c..68c628ecbe2f596c93b6ac0d6b1c68cbb6b0a508 100644
|
index c86f1e090cb844fb555098d128391ae66de2d594..1f20ff61a66f9a269fe5d5257470ef99e11fa72c 100644
|
||||||
--- a/content/browser/compositor/viz_process_transport_factory.cc
|
--- a/content/browser/compositor/viz_process_transport_factory.cc
|
||||||
+++ b/content/browser/compositor/viz_process_transport_factory.cc
|
+++ b/content/browser/compositor/viz_process_transport_factory.cc
|
||||||
@@ -401,8 +401,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
@@ -395,8 +395,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
|
||||||
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
|
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
|
||||||
root_params->display_private =
|
root_params->display_private =
|
||||||
display_private.BindNewEndpointAndPassReceiver();
|
display_private.BindNewEndpointAndPassReceiver();
|
||||||
|
|
|
@ -49,10 +49,10 @@ index 185c4ba2dad840a35dd06ab874c8e2b2f5c1730c..9b3107a616d68d02065470a3b8e517b1
|
||||||
mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
|
mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
|
||||||
mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
|
mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
|
||||||
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
|
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
|
||||||
index 5c5632b9563f748f8dfbf1395c06d6692d57be10..aac7abb6613277c27bc4e83202094660f943a80b 100644
|
index b60c907a5ab72a618c7675844626f425a045af68..53f5e2535db83c68bb808571619da22adea7ba4e 100644
|
||||||
--- a/services/network/public/cpp/url_request_mojom_traits.cc
|
--- a/services/network/public/cpp/url_request_mojom_traits.cc
|
||||||
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
|
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
|
||||||
@@ -88,6 +88,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
|
@@ -93,6 +93,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
|
||||||
out->disable_secure_dns = data.disable_secure_dns();
|
out->disable_secure_dns = data.disable_secure_dns();
|
||||||
out->has_user_activation = data.has_user_activation();
|
out->has_user_activation = data.has_user_activation();
|
||||||
out->allow_cookies_from_browser = data.allow_cookies_from_browser();
|
out->allow_cookies_from_browser = data.allow_cookies_from_browser();
|
||||||
|
@ -76,10 +76,10 @@ index 549b0da0d4790e0ced3048e7167fe1a74ab3f78a..71bc5c45d4f2ecf0abb7f6045bd9945e
|
||||||
cookie_observer(
|
cookie_observer(
|
||||||
const network::ResourceRequest::TrustedParams& trusted_params) {
|
const network::ResourceRequest::TrustedParams& trusted_params) {
|
||||||
diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
|
diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
|
||||||
index 237e3fbfc9aec50dd74bd6a0e1235d2b50ad9fcd..3c81dda1ea478696790b3b4a2a3b7e59acaf70c3 100644
|
index fa378b77ccfe9de4e4152352705e7bb1c9fcabee..b7687fed1cb3a9db028f19913c34696e28e23ff3 100644
|
||||||
--- a/services/network/public/mojom/url_request.mojom
|
--- a/services/network/public/mojom/url_request.mojom
|
||||||
+++ b/services/network/public/mojom/url_request.mojom
|
+++ b/services/network/public/mojom/url_request.mojom
|
||||||
@@ -72,6 +72,9 @@ struct TrustedUrlRequestParams {
|
@@ -73,6 +73,9 @@ struct TrustedUrlRequestParams {
|
||||||
// FollowRedirect().
|
// FollowRedirect().
|
||||||
bool allow_cookies_from_browser;
|
bool allow_cookies_from_browser;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ Subject: fix: allow guest webcontents to enter fullscreen
|
||||||
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
|
This can be upstreamed, a guest webcontents can't technically become the focused webContents. This DCHECK should allow all guest webContents to request fullscreen entrance.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index a93df5a741dbf2eb99a454050e7f31c506d0ce8d..49dd8a662476adc481b80241086f60517c24dd82 100644
|
index fbae94d817d600df09052da88180d1e2a83361fa..275c0c903cce8dbc5936452930184047d257b5f0 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3603,7 +3603,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
@@ -3603,7 +3603,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
||||||
|
|
|
@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
|
||||||
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||||
index 4e95d8d087ed3fd9832396d71faa64bb33953dbf..895fdd1a002c0bbef3548353a5a8300dd13f594c 100644
|
index be377b434ebf579962808a6b3ee377ea0e240734..56094608d0b7877f8b747e4262ec9db964885928 100644
|
||||||
--- a/content/browser/renderer_host/navigation_request.cc
|
--- a/content/browser/renderer_host/navigation_request.cc
|
||||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -7382,10 +7382,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
@@ -7323,10 +7323,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||||
if (IsForMhtmlSubframe())
|
if (IsForMhtmlSubframe())
|
||||||
return origin_with_debug_info;
|
return origin_with_debug_info;
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ index 4e95d8d087ed3fd9832396d71faa64bb33953dbf..895fdd1a002c0bbef3548353a5a8300d
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
index 0696c1d31dd035f1a2cbfe978684c75063a533f1..7fda5fa77989b46159e351f6a6a7218514fb60bd 100644
|
index 09ddb217948bde74dff56d1ab030f1ccc6fd77a8..778520d167229a8278657bcede2798eb6e04a6e3 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.h
|
--- a/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.h
|
+++ b/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
@@ -2913,6 +2913,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
@@ -2915,6 +2915,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||||
// last committed document.
|
// last committed document.
|
||||||
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
|
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ index 0696c1d31dd035f1a2cbfe978684c75063a533f1..7fda5fa77989b46159e351f6a6a72185
|
||||||
// Sets a ResourceCache in the renderer. `this` must be active and there must
|
// Sets a ResourceCache in the renderer. `this` must be active and there must
|
||||||
// be no pending navigation. `remote` must have the same and process
|
// be no pending navigation. `remote` must have the same and process
|
||||||
// isolation policy.
|
// isolation policy.
|
||||||
@@ -3286,17 +3297,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
@@ -3288,17 +3299,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||||
// relevant.
|
// relevant.
|
||||||
void ResetWaitingState();
|
void ResetWaitingState();
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ node does not change in this case.
|
||||||
chromium-bug: https://crbug.com/1369605
|
chromium-bug: https://crbug.com/1369605
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
||||||
index 8f57ba0f182fa1ae687b628c3b050d58f9ab5426..865dba163fb68ca2ab3bde5b54a0024dc650cde1 100644
|
index 5084fb89d155f35caace1e1c70ed86994206ba2c..64244821d7430faaa29842414d9bbfe8364f2e68 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
|
||||||
@@ -996,6 +996,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties(
|
@@ -996,6 +996,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties(
|
||||||
|
@ -32,7 +32,7 @@ index 8f57ba0f182fa1ae687b628c3b050d58f9ab5426..865dba163fb68ca2ab3bde5b54a0024d
|
||||||
if (!text_input_manager_)
|
if (!text_input_manager_)
|
||||||
return ui::TEXT_INPUT_TYPE_NONE;
|
return ui::TEXT_INPUT_TYPE_NONE;
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
||||||
index 7935adbe496cacd9b02390439f759186e77ba336..a16bc977a807cf23aff0f1611ffab2fb3bca679f 100644
|
index ed0641b888c6421b1791c086466bd9c158e9109d..3760b3823d5af3325017bb53f5b1d38e6d9091d8 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
|
||||||
@@ -181,6 +181,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
@@ -181,6 +181,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
||||||
|
@ -45,10 +45,10 @@ index 7935adbe496cacd9b02390439f759186e77ba336..a16bc977a807cf23aff0f1611ffab2fb
|
||||||
// RenderFrameMetadataProvider::Observer implementation.
|
// RenderFrameMetadataProvider::Observer implementation.
|
||||||
void OnRenderFrameMetadataChangedBeforeActivation(
|
void OnRenderFrameMetadataChangedBeforeActivation(
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 49dd8a662476adc481b80241086f60517c24dd82..c5aece69290712db5c184e1b449a5d1abff41f9d 100644
|
index 275c0c903cce8dbc5936452930184047d257b5f0..e01bcb9f5c715cd03dcce6f3ca3bd532b8062a75 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -8122,7 +8122,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
@@ -8123,7 +8123,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
||||||
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
||||||
"render_frame_host", frame);
|
"render_frame_host", frame);
|
||||||
RenderWidgetHostViewBase* root_view =
|
RenderWidgetHostViewBase* root_view =
|
||||||
|
|
|
@ -25,7 +25,7 @@ index 3f6289a9cee6d94349ef30760aad4a2b0a015c25..63b833fb3473f526be21ebe4549e17ee
|
||||||
// Returns true if duplex mode is set.
|
// Returns true if duplex mode is set.
|
||||||
bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
|
bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
|
||||||
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
|
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
|
||||||
index 01df1c7ddfeb4a08e9c35e3db2dd54823d8236bb..9b851930d6d1b966f8286e2a309141d545c60277 100644
|
index 2748468ba184dca7befd1a1411dc3a27e2df7175..e1230b5df685a04c60404ff4345c6ec9ef86e98c 100644
|
||||||
--- a/printing/printing_context_mac.mm
|
--- a/printing/printing_context_mac.mm
|
||||||
+++ b/printing/printing_context_mac.mm
|
+++ b/printing/printing_context_mac.mm
|
||||||
@@ -204,7 +204,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,
|
@@ -204,7 +204,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,
|
||||||
|
|
|
@ -64,10 +64,10 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c
|
||||||
|
|
||||||
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index 0ea3c6c8b4a718821ea5dd40cb9239114207216d..2c1abfad1538e92ddafbd09ed77beacce859e79d 100644
|
index 10c969ab87be91f01b5ea5aca267a22551df621e..4f8e09278c176fbd55e61fbf32ce60e492d6b0e1 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -2694,6 +2694,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -2712,6 +2712,7 @@ void LocalFrame::RequestExecuteScript(
|
||||||
mojom::blink::EvaluationTiming evaluation_timing,
|
mojom::blink::EvaluationTiming evaluation_timing,
|
||||||
mojom::blink::LoadEventBlockingOption blocking_option,
|
mojom::blink::LoadEventBlockingOption blocking_option,
|
||||||
WebScriptExecutionCallback callback,
|
WebScriptExecutionCallback callback,
|
||||||
|
@ -75,7 +75,7 @@ index 0ea3c6c8b4a718821ea5dd40cb9239114207216d..2c1abfad1538e92ddafbd09ed77beacc
|
||||||
BackForwardCacheAware back_forward_cache_aware,
|
BackForwardCacheAware back_forward_cache_aware,
|
||||||
mojom::blink::WantResultOption want_result_option,
|
mojom::blink::WantResultOption want_result_option,
|
||||||
mojom::blink::PromiseResultOption promise_behavior) {
|
mojom::blink::PromiseResultOption promise_behavior) {
|
||||||
@@ -2724,7 +2725,8 @@ void LocalFrame::RequestExecuteScript(
|
@@ -2742,7 +2743,8 @@ void LocalFrame::RequestExecuteScript(
|
||||||
PausableScriptExecutor::CreateAndRun(
|
PausableScriptExecutor::CreateAndRun(
|
||||||
ToScriptState(DomWindow(), *world), std::move(script_sources),
|
ToScriptState(DomWindow(), *world), std::move(script_sources),
|
||||||
execute_script_policy, user_gesture, evaluation_timing, blocking_option,
|
execute_script_policy, user_gesture, evaluation_timing, blocking_option,
|
||||||
|
@ -86,10 +86,10 @@ index 0ea3c6c8b4a718821ea5dd40cb9239114207216d..2c1abfad1538e92ddafbd09ed77beacc
|
||||||
|
|
||||||
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
index 0cc1aaee2af66a2b1684d26bd089bb377fbf0995..c29af4b02ccbd0aff36180125dd14abc19346309 100644
|
index 8a3d0eedf7fbbc7e7d415f2d7e35914c9d1d4b07..9a38c0eb3087412e1e1b30e3f05542329b5d6fd8 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
@@ -787,6 +787,7 @@ class CORE_EXPORT LocalFrame final
|
@@ -789,6 +789,7 @@ class CORE_EXPORT LocalFrame final
|
||||||
mojom::blink::EvaluationTiming,
|
mojom::blink::EvaluationTiming,
|
||||||
mojom::blink::LoadEventBlockingOption,
|
mojom::blink::LoadEventBlockingOption,
|
||||||
WebScriptExecutionCallback,
|
WebScriptExecutionCallback,
|
||||||
|
@ -98,7 +98,7 @@ index 0cc1aaee2af66a2b1684d26bd089bb377fbf0995..c29af4b02ccbd0aff36180125dd14abc
|
||||||
mojom::blink::WantResultOption,
|
mojom::blink::WantResultOption,
|
||||||
mojom::blink::PromiseResultOption);
|
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
|
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 b113185789eeac08b122242a0a41f039d11ce14b..032152d8a352de401d076c95e52d273d81a3030e 100644
|
index 2c07c1efc6d25a96f05805dbe5242c45f5d3d97e..198a4a5b0a7619fbcb7a30b368edcec025616aca 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
||||||
@@ -954,6 +954,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
|
@@ -954,6 +954,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
|
||||||
|
|
|
@ -39,7 +39,7 @@ index e7e710d58e2bdf1f0bc042f479add048f3aa1ffb..dc0d69a726f389e4925001fc2c817fe0
|
||||||
dbus::MethodCall* method_call,
|
dbus::MethodCall* method_call,
|
||||||
dbus::ExportedObject::ResponseSender sender) {
|
dbus::ExportedObject::ResponseSender sender) {
|
||||||
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
||||||
index 1b0ffb4b1582f63bb13800f2f03bb4506988e8ff..b4498415faa5ecb1dc9e058fedde4dc03a300250 100644
|
index 2c0df96d2840e6198604041fe1e1b63c89251208..09df6bb9fab6cffbab6302a04b7343b75568cdc3 100644
|
||||||
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
||||||
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
|
||||||
@@ -71,10 +71,16 @@ class StatusIconLinuxDbus : public ui::StatusIconLinux,
|
@@ -71,10 +71,16 @@ class StatusIconLinuxDbus : public ui::StatusIconLinux,
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
|
||||||
Allows embedder to intercept site instances created by chromium.
|
Allows embedder to intercept site instances created by chromium.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
index d9a57f3119f94051097472d8b8560106ce527e5d..39a00533445347b2247471848d9a6e84cebc864c 100644
|
index 7e7179d7bf818a961ab60e16f168621f2f45d8d0..8d05ce8e9ffb13dc9ee2daef548ab25ba8ba9679 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
@@ -3958,6 +3958,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
@@ -3979,6 +3979,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||||
request->ResetStateForSiteInstanceChange();
|
request->ResetStateForSiteInstanceChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,10 +20,10 @@ index d9a57f3119f94051097472d8b8560106ce527e5d..39a00533445347b2247471848d9a6e84
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||||
index 624ca55fd047d68d456be85f8bc45de57c452f67..9ec568626e355be8c800e6beebc4c008b041a09a 100644
|
index cfb536c2642b21e4edf60e677bce96a506189bb5..2f22c5e2b33a125dbbef3fe524f522bc06e882be 100644
|
||||||
--- a/content/public/browser/content_browser_client.h
|
--- a/content/public/browser/content_browser_client.h
|
||||||
+++ b/content/public/browser/content_browser_client.h
|
+++ b/content/public/browser/content_browser_client.h
|
||||||
@@ -303,6 +303,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
@@ -304,6 +304,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||||
|
|
||||||
virtual ~ContentBrowserClient() = default;
|
virtual ~ContentBrowserClient() = default;
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,10 @@ index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb2497
|
||||||
// Returns whether `Initialize` has already been invoked in the process.
|
// Returns whether `Initialize` has already been invoked in the process.
|
||||||
// Initialization is a one-way operation (i.e., this method cannot return
|
// Initialization is a one-way operation (i.e., this method cannot return
|
||||||
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
||||||
index ba3ab6adff0db46c8a1fca2e1bf3b3cb4a41fbdd..0d56182a284b91e7bf5749dbf0796cbe705d2c1f 100644
|
index 39185f759db0398c36dbdc140eb27644516f6bcd..5d97de5f7072054fdd57f0240c6faf0865013f3f 100644
|
||||||
--- a/gin/v8_initializer.cc
|
--- a/gin/v8_initializer.cc
|
||||||
+++ b/gin/v8_initializer.cc
|
+++ b/gin/v8_initializer.cc
|
||||||
@@ -402,7 +402,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
@@ -414,7 +414,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
||||||
// static
|
// static
|
||||||
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
||||||
const std::string js_command_line_flags,
|
const std::string js_command_line_flags,
|
||||||
|
@ -51,7 +51,7 @@ index ba3ab6adff0db46c8a1fca2e1bf3b3cb4a41fbdd..0d56182a284b91e7bf5749dbf0796cbe
|
||||||
static bool v8_is_initialized = false;
|
static bool v8_is_initialized = false;
|
||||||
if (v8_is_initialized)
|
if (v8_is_initialized)
|
||||||
return;
|
return;
|
||||||
@@ -412,7 +413,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
@@ -424,7 +425,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
||||||
// See https://crbug.com/v8/11043
|
// See https://crbug.com/v8/11043
|
||||||
SetFlags(mode, js_command_line_flags);
|
SetFlags(mode, js_command_line_flags);
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
|
||||||
Add electron resources file to the list of resource ids generation.
|
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
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
||||||
index a7bdccf0ab714763164f42b3e97aeaf1e51098de..fa48ef30f1f39c40618523d2d3ed931c58ccd747 100644
|
index b7fe3bcb125fa6d3a9169a380529bd001d071947..67c16dea3a99812b0950bd33d9ad8ded0dcc7ae9 100644
|
||||||
--- a/tools/gritsettings/resource_ids.spec
|
--- a/tools/gritsettings/resource_ids.spec
|
||||||
+++ b/tools/gritsettings/resource_ids.spec
|
+++ b/tools/gritsettings/resource_ids.spec
|
||||||
@@ -1165,6 +1165,11 @@
|
@@ -1181,6 +1181,11 @@
|
||||||
"includes": [7440],
|
"includes": [7440],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ index 807a8f82fd0d6bfd402a5f84b5a9849a0f56f7e9..b351d8d47322d56bb219ad05d19d42c4
|
||||||
properties->supports_global_application_menus = true;
|
properties->supports_global_application_menus = true;
|
||||||
properties->app_modal_dialogs_use_event_blocker = true;
|
properties->app_modal_dialogs_use_event_blocker = true;
|
||||||
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
|
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
|
||||||
index f61ffe943680896432cad35d849e6a0ae5042d42..83e842039e821381edb8b4c96a6aabe34c009ea8 100644
|
index b7991d9efb0076487fee7698debd6958b9e5177e..58215c5cb86a0d5d3f6699c84f680e65db3dcab3 100644
|
||||||
--- a/ui/ozone/public/ozone_platform.h
|
--- a/ui/ozone/public/ozone_platform.h
|
||||||
+++ b/ui/ozone/public/ozone_platform.h
|
+++ b/ui/ozone/public/ozone_platform.h
|
||||||
@@ -121,6 +121,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
|
@@ -121,6 +121,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
|
||||||
|
|
|
@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
|
||||||
in the browser process.
|
in the browser process.
|
||||||
|
|
||||||
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
|
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
|
||||||
index a068f7a77cbaf6487b1923dd7faa703973443d95..93eac2b049ecfb5a7650e778ea4e243bc1ca5b4d 100644
|
index cd3ba8776da4ebd0bf39687c1c87ae59b96d59a7..62e4947ec2974c1ef2152e78d05b2100f49e5616 100644
|
||||||
--- a/content/app/content_main_runner_impl.cc
|
--- a/content/app/content_main_runner_impl.cc
|
||||||
+++ b/content/app/content_main_runner_impl.cc
|
+++ b/content/app/content_main_runner_impl.cc
|
||||||
@@ -279,11 +279,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
|
@@ -274,11 +274,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
|
||||||
|
|
||||||
bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
|
bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
|
||||||
const std::string& process_type) {
|
const std::string& process_type) {
|
||||||
|
|
|
@ -14,10 +14,10 @@ Disable usage of the following private APIs in MAS builds:
|
||||||
* AudioDeviceDuck
|
* AudioDeviceDuck
|
||||||
|
|
||||||
diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
|
diff --git a/base/enterprise_util_mac.mm b/base/enterprise_util_mac.mm
|
||||||
index 91a65a1e700cf1accb8e4541e0ceca4e0a734b16..323b9b48214aa013ad8f7da2f63cca2ee3295d68 100644
|
index 32837d4ef4fddecf510c8681bc9bdb65f06cdbe6..6eac43311d31a5c71e07b74c8a9fbbbf46466eeb 100644
|
||||||
--- a/base/enterprise_util_mac.mm
|
--- a/base/enterprise_util_mac.mm
|
||||||
+++ b/base/enterprise_util_mac.mm
|
+++ b/base/enterprise_util_mac.mm
|
||||||
@@ -189,6 +189,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
|
@@ -193,6 +193,13 @@ MacDeviceManagementStateNew IsDeviceRegisteredWithManagementNew() {
|
||||||
DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
|
DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
|
||||||
static DeviceUserDomainJoinState state = [] {
|
static DeviceUserDomainJoinState state = [] {
|
||||||
DeviceUserDomainJoinState state{false, false};
|
DeviceUserDomainJoinState state{false, false};
|
||||||
|
@ -31,7 +31,7 @@ index 91a65a1e700cf1accb8e4541e0ceca4e0a734b16..323b9b48214aa013ad8f7da2f63cca2e
|
||||||
|
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
ODSession* session = [ODSession defaultSession];
|
ODSession* session = [ODSession defaultSession];
|
||||||
@@ -295,5 +302,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
|
@@ -299,5 +306,6 @@ DeviceUserDomainJoinState AreDeviceAndUserJoinedToDomain() {
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,10 +44,10 @@ index 88e4b9b878b59014dc3c4e875eb2acb1b72e7559..b5bdb96a05ab084166d64d4ca69ff917
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
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
|
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 8e858bb088a49d9c8863a929f5698368dfe84ecf..2981ff2781093fea50c82cd4214c1fbb15dea9b7 100644
|
index f31f2245a586079d5125a514e05e41e6cee478a2..16b9132250a2850a5c09cc4268c7ce9f400f158e 100644
|
||||||
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
||||||
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
||||||
@@ -572,10 +572,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
|
@@ -571,10 +571,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
|
||||||
// this should be treated as an error and caught early.
|
// this should be treated as an error and caught early.
|
||||||
CHECK(bridged_view_);
|
CHECK(bridged_view_);
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ index 1ae5b54369158da65d552f3c848e0f3c805b0f5c..e15e6b3e145aecfddd1ce20fdd6c844b
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
||||||
index 1876224cb6c51636b67d3bd5493ee34973f2af5f..260725d466d890dfec29d423700510f55caa7a52 100644
|
index 6f4679b7ecef47a0f1fd16b5772dd7bf84d0549c..4de874f3d12be434ea7f7f9737077a37cd11dc4c 100644
|
||||||
--- a/ui/base/BUILD.gn
|
--- a/ui/base/BUILD.gn
|
||||||
+++ b/ui/base/BUILD.gn
|
+++ b/ui/base/BUILD.gn
|
||||||
@@ -372,6 +372,13 @@ component("base") {
|
@@ -372,6 +372,13 @@ component("base") {
|
||||||
|
|
|
@ -7,10 +7,10 @@ This adds a callback from the network service that's used to implement
|
||||||
session.setCertificateVerifyCallback.
|
session.setCertificateVerifyCallback.
|
||||||
|
|
||||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||||
index 6b9e093367cad7531f1880d5e05641605dc94c62..f2ae2092be6042f48d50f690581dccff8a3e2566 100644
|
index d553d31e90ca7f3ea9a540d0eda7aaa6801f007b..0ffa0ec042bd59de5d28fad53dee2b6321d64b18 100644
|
||||||
--- a/services/network/network_context.cc
|
--- a/services/network/network_context.cc
|
||||||
+++ b/services/network/network_context.cc
|
+++ b/services/network/network_context.cc
|
||||||
@@ -141,6 +141,11 @@
|
@@ -142,6 +142,11 @@
|
||||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||||
#include "url/gurl.h"
|
#include "url/gurl.h"
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ index 6b9e093367cad7531f1880d5e05641605dc94c62..f2ae2092be6042f48d50f690581dccff
|
||||||
#if BUILDFLAG(IS_CT_SUPPORTED)
|
#if BUILDFLAG(IS_CT_SUPPORTED)
|
||||||
#include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
|
#include "components/certificate_transparency/chrome_ct_policy_enforcer.h"
|
||||||
#include "components/certificate_transparency/chrome_require_ct_delegate.h"
|
#include "components/certificate_transparency/chrome_require_ct_delegate.h"
|
||||||
@@ -433,6 +438,99 @@ bool GetFullDataFilePath(
|
@@ -434,6 +439,99 @@ bool GetFullDataFilePath(
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@ index 6b9e093367cad7531f1880d5e05641605dc94c62..f2ae2092be6042f48d50f690581dccff
|
||||||
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
|
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
|
||||||
|
|
||||||
NetworkContext::PendingCertVerify::PendingCertVerify() = default;
|
NetworkContext::PendingCertVerify::PendingCertVerify() = default;
|
||||||
@@ -753,6 +851,13 @@ void NetworkContext::SetClient(
|
@@ -756,6 +854,13 @@ void NetworkContext::SetClient(
|
||||||
client_.Bind(std::move(client));
|
client_.Bind(std::move(client));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,7 +136,7 @@ index 6b9e093367cad7531f1880d5e05641605dc94c62..f2ae2092be6042f48d50f690581dccff
|
||||||
void NetworkContext::CreateURLLoaderFactory(
|
void NetworkContext::CreateURLLoaderFactory(
|
||||||
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
|
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
|
||||||
mojom::URLLoaderFactoryParamsPtr params) {
|
mojom::URLLoaderFactoryParamsPtr params) {
|
||||||
@@ -2286,6 +2391,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
@@ -2289,6 +2394,9 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||||
std::move(cert_verifier));
|
std::move(cert_verifier));
|
||||||
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
|
cert_verifier = base::WrapUnique(cert_verifier_with_trust_anchors_.get());
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||||
|
|
|
@ -133,10 +133,10 @@ index bbd2aa78722fc0a14ac815ca0243b83965ad8d7c..b6e0a2fce3a0fb9c449aa1bef6a0f970
|
||||||
const GURL& document_url,
|
const GURL& document_url,
|
||||||
const WeakDocumentPtr& weak_document_ptr,
|
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
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
index d0814b812f4880cd5577a0b95cbc406ae0147f95..17415e1009465f44b606236cd6e525e612d6ebe9 100644
|
index f073addb3f1e92007e474baa8fa265b71d2874f8..b95fda20552eda765f680786f79c65dd9fc06ecb 100644
|
||||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
@@ -2178,7 +2178,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
@@ -2220,7 +2220,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||||
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
||||||
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
||||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||||
|
@ -145,7 +145,7 @@ index d0814b812f4880cd5577a0b95cbc406ae0147f95..17415e1009465f44b606236cd6e525e6
|
||||||
creator_type, std::move(receiver));
|
creator_type, std::move(receiver));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2186,7 +2186,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
@@ -2228,7 +2228,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||||
CHECK(rfh);
|
CHECK(rfh);
|
||||||
|
|
||||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||||
|
|
|
@ -8,10 +8,10 @@ needed in chromium but our autofill implementation uses them. This patch can be
|
||||||
our autofill implementation to work like Chromium's.
|
our autofill implementation to work like Chromium's.
|
||||||
|
|
||||||
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
|
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
|
||||||
index c5a7e77448422e934bd302016e9d53efc244ebbe..6ae95574acf18bc7679eb401d753f027d4c6355d 100644
|
index a8cc3f5c3db23081343c5530b1f37a78bae014bf..6a0173f1593341ef2f89613c8b99632a375b3746 100644
|
||||||
--- a/ui/color/color_id.h
|
--- a/ui/color/color_id.h
|
||||||
+++ b/ui/color/color_id.h
|
+++ b/ui/color/color_id.h
|
||||||
@@ -364,6 +364,10 @@
|
@@ -368,6 +368,10 @@
|
||||||
E_CPONLY(kColorScrollbarThumbInactive) \
|
E_CPONLY(kColorScrollbarThumbInactive) \
|
||||||
E_CPONLY(kColorScrollbarThumbPressed) \
|
E_CPONLY(kColorScrollbarThumbPressed) \
|
||||||
E_CPONLY(kColorScrollbarTrack) \
|
E_CPONLY(kColorScrollbarTrack) \
|
||||||
|
@ -22,7 +22,7 @@ index c5a7e77448422e934bd302016e9d53efc244ebbe..6ae95574acf18bc7679eb401d753f027
|
||||||
E_CPONLY(kColorSegmentedButtonBorder) \
|
E_CPONLY(kColorSegmentedButtonBorder) \
|
||||||
E_CPONLY(kColorSegmentedButtonFocus) \
|
E_CPONLY(kColorSegmentedButtonFocus) \
|
||||||
E_CPONLY(kColorSegmentedButtonForegroundChecked) \
|
E_CPONLY(kColorSegmentedButtonForegroundChecked) \
|
||||||
@@ -451,6 +455,7 @@
|
@@ -455,6 +459,7 @@
|
||||||
E_CPONLY(kColorTreeNodeForeground) \
|
E_CPONLY(kColorTreeNodeForeground) \
|
||||||
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
|
E_CPONLY(kColorTreeNodeForegroundSelectedFocused) \
|
||||||
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
|
E_CPONLY(kColorTreeNodeForegroundSelectedUnfocused) \
|
||||||
|
|
|
@ -11,7 +11,7 @@ majority of changes originally come from these PRs:
|
||||||
This patch also fixes callback for manual user cancellation and success.
|
This patch also fixes callback for manual user cancellation and success.
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index 48647e655b7b508117ea4373572cbab283d62e0e..e943d5ad0f0ebd720315d8913dd19589999407f5 100644
|
index 85f6428008b8710d6af5008a95a84d346d14c185..73a1756e723ef24e49b8893f1336f78e099765c5 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -968,7 +968,6 @@ if (is_win) {
|
@@ -968,7 +968,6 @@ if (is_win) {
|
||||||
|
@ -91,7 +91,7 @@ index 3a66a52b8d3c6da9cd8d7e9afdc8d59f528ec3d5..facaa6fbca8ee7c04f83607e62b81b95
|
||||||
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
|
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
|
||||||
}
|
}
|
||||||
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
||||||
index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b93536b9d 100644
|
index 2bb42383d753ac39953adf5dccf1cbc02f100b88..65f2ad490414f1631cb65ead5dafcffdd4ff2077 100644
|
||||||
--- a/chrome/browser/printing/print_view_manager_base.cc
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
||||||
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
||||||
@@ -23,7 +23,9 @@
|
@@ -23,7 +23,9 @@
|
||||||
|
@ -240,7 +240,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -607,10 +642,12 @@ void PrintViewManagerBase::DidPrintDocument(
|
@@ -608,10 +643,12 @@ void PrintViewManagerBase::DidPrintDocument(
|
||||||
void PrintViewManagerBase::GetDefaultPrintSettings(
|
void PrintViewManagerBase::GetDefaultPrintSettings(
|
||||||
GetDefaultPrintSettingsCallback callback) {
|
GetDefaultPrintSettingsCallback callback) {
|
||||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||||
|
@ -253,7 +253,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
||||||
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
||||||
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
|
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
|
||||||
@@ -661,10 +698,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
@@ -662,10 +699,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
||||||
base::Value::Dict job_settings,
|
base::Value::Dict job_settings,
|
||||||
UpdatePrintSettingsCallback callback) {
|
UpdatePrintSettingsCallback callback) {
|
||||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||||
|
@ -266,7 +266,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
|
|
||||||
absl::optional<int> printer_type_value =
|
absl::optional<int> printer_type_value =
|
||||||
job_settings.FindInt(kSettingPrinterType);
|
job_settings.FindInt(kSettingPrinterType);
|
||||||
@@ -675,6 +714,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
@@ -676,6 +715,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
||||||
|
|
||||||
mojom::PrinterType printer_type =
|
mojom::PrinterType printer_type =
|
||||||
static_cast<mojom::PrinterType>(*printer_type_value);
|
static_cast<mojom::PrinterType>(*printer_type_value);
|
||||||
|
@ -274,7 +274,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
if (printer_type != mojom::PrinterType::kExtension &&
|
if (printer_type != mojom::PrinterType::kExtension &&
|
||||||
printer_type != mojom::PrinterType::kPdf &&
|
printer_type != mojom::PrinterType::kPdf &&
|
||||||
printer_type != mojom::PrinterType::kLocal) {
|
printer_type != mojom::PrinterType::kLocal) {
|
||||||
@@ -694,6 +734,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
@@ -695,6 +735,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
||||||
if (value > 0)
|
if (value > 0)
|
||||||
job_settings.Set(kSettingRasterizePdfDpi, value);
|
job_settings.Set(kSettingRasterizePdfDpi, value);
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
|
|
||||||
std::unique_ptr<PrintSettings> print_settings =
|
std::unique_ptr<PrintSettings> print_settings =
|
||||||
PrintSettingsFromJobSettings(job_settings);
|
PrintSettingsFromJobSettings(job_settings);
|
||||||
@@ -743,7 +784,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
@@ -744,7 +785,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
||||||
void PrintViewManagerBase::IsPrintingEnabled(
|
void PrintViewManagerBase::IsPrintingEnabled(
|
||||||
IsPrintingEnabledCallback callback) {
|
IsPrintingEnabledCallback callback) {
|
||||||
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
||||||
|
@ -291,7 +291,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
||||||
@@ -759,14 +800,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
@@ -760,14 +801,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
||||||
// didn't happen for some reason.
|
// didn't happen for some reason.
|
||||||
bad_message::ReceivedBadMessage(
|
bad_message::ReceivedBadMessage(
|
||||||
render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
|
render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
|
||||||
|
@ -308,7 +308,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -801,6 +842,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
@@ -802,6 +843,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
||||||
|
|
||||||
PrintManager::PrintingFailed(cookie, reason);
|
PrintManager::PrintingFailed(cookie, reason);
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
// `PrintingFailed()` can occur because asynchronous compositing results
|
// `PrintingFailed()` can occur because asynchronous compositing results
|
||||||
// don't complete until after a print job has already failed and been
|
// don't complete until after a print job has already failed and been
|
||||||
// destroyed. In such cases the error notification to the user will
|
// destroyed. In such cases the error notification to the user will
|
||||||
@@ -810,7 +852,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
@@ -811,7 +853,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
||||||
print_job_->document()->cookie() == cookie) {
|
print_job_->document()->cookie() == cookie) {
|
||||||
ShowPrintErrorDialogForGenericError();
|
ShowPrintErrorDialogForGenericError();
|
||||||
}
|
}
|
||||||
|
@ -325,8 +325,8 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
ReleasePrinterQuery();
|
ReleasePrinterQuery();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -822,15 +864,24 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
|
@@ -823,15 +865,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
|
||||||
observers_.RemoveObserver(&observer);
|
test_observers_.RemoveObserver(&observer);
|
||||||
}
|
}
|
||||||
|
|
||||||
+void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
+void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
||||||
|
@ -350,7 +350,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintViewManagerBase::RenderFrameDeleted(
|
void PrintViewManagerBase::RenderFrameDeleted(
|
||||||
@@ -882,7 +933,12 @@ void PrintViewManagerBase::OnJobDone() {
|
@@ -883,7 +934,12 @@ void PrintViewManagerBase::OnJobDone() {
|
||||||
// Printing is done, we don't need it anymore.
|
// Printing is done, we don't need it anymore.
|
||||||
// print_job_->is_job_pending() may still be true, depending on the order
|
// print_job_->is_job_pending() may still be true, depending on the order
|
||||||
// of object registration.
|
// of object registration.
|
||||||
|
@ -364,7 +364,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
ReleasePrintJob();
|
ReleasePrintJob();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -891,9 +947,10 @@ void PrintViewManagerBase::OnCanceling() {
|
@@ -892,9 +948,10 @@ void PrintViewManagerBase::OnCanceling() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintViewManagerBase::OnFailed() {
|
void PrintViewManagerBase::OnFailed() {
|
||||||
|
@ -376,7 +376,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
TerminatePrintJob(true);
|
TerminatePrintJob(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -903,7 +960,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
|
@@ -904,7 +961,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
|
||||||
|
|
||||||
// Is the document already complete?
|
// Is the document already complete?
|
||||||
if (print_job_->document() && print_job_->document()->IsComplete()) {
|
if (print_job_->document() && print_job_->document()->IsComplete()) {
|
||||||
|
@ -385,7 +385,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -951,7 +1008,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
@@ -952,7 +1009,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
||||||
|
|
||||||
// Disconnect the current `print_job_`.
|
// Disconnect the current `print_job_`.
|
||||||
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
||||||
|
@ -397,7 +397,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
if (!weak_this)
|
if (!weak_this)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -972,7 +1032,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
@@ -973,7 +1033,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
||||||
#endif
|
#endif
|
||||||
print_job_->AddObserver(*this);
|
print_job_->AddObserver(*this);
|
||||||
|
|
||||||
|
@ -406,7 +406,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1034,6 +1094,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
@@ -1041,6 +1101,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -418,7 +418,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
if (!print_job_)
|
if (!print_job_)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -1041,7 +1106,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
@@ -1048,7 +1113,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
||||||
// printing_rfh_ should only ever point to a RenderFrameHost with a live
|
// printing_rfh_ should only ever point to a RenderFrameHost with a live
|
||||||
// RenderFrame.
|
// RenderFrame.
|
||||||
DCHECK(rfh->IsRenderFrameLive());
|
DCHECK(rfh->IsRenderFrameLive());
|
||||||
|
@ -427,7 +427,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
}
|
}
|
||||||
|
|
||||||
print_job_->RemoveObserver(*this);
|
print_job_->RemoveObserver(*this);
|
||||||
@@ -1083,7 +1148,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
@@ -1090,7 +1155,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
||||||
|
@ -436,17 +436,17 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (!cookie) {
|
if (!cookie) {
|
||||||
@@ -1191,7 +1256,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
|
@@ -1199,7 +1264,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
|
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
|
||||||
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
||||||
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(/*silent=*/true, /*job_settings=*/base::Value::Dict());
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(/*silent=*/true, /*job_settings=*/base::Value::Dict());
|
||||||
|
|
||||||
for (auto& observer : GetObservers())
|
for (auto& observer : GetTestObservers()) {
|
||||||
observer.OnPrintNow(rfh);
|
observer.OnPrintNow(rfh);
|
||||||
@@ -1239,7 +1304,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
|
@@ -1249,7 +1314,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
|
||||||
bool allowed) {
|
set_analyzing_content(/*analyzing*/ false);
|
||||||
if (!allowed || !printing_rfh_ || IsCrashed() ||
|
if (!allowed || !printing_rfh_ || IsCrashed() ||
|
||||||
!printing_rfh_->IsRenderFrameLive()) {
|
!printing_rfh_->IsRenderFrameLive()) {
|
||||||
- std::move(callback).Run(nullptr);
|
- std::move(callback).Run(nullptr);
|
||||||
|
@ -455,7 +455,7 @@ index d7a3961a5c79e4d4f9f0fc5fbd6f1c55ab65ca9d..45c3bd7ef13be525ea6fbc2610513a0b
|
||||||
}
|
}
|
||||||
CompleteScriptedPrint(printing_rfh_, std::move(params), std::move(callback));
|
CompleteScriptedPrint(printing_rfh_, std::move(params), std::move(callback));
|
||||||
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
||||||
index 0b07b29da7df2595270391aed19e6eecd53b9f02..a5fb7fb6aac719df0dfed116daf798314a07b244 100644
|
index 8af22e511701a595b77bea31da096caedc2e47ce..d1e3bc5ea012de1f1155546ef66c5e3e1c6b11de 100644
|
||||||
--- a/chrome/browser/printing/print_view_manager_base.h
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
||||||
+++ b/chrome/browser/printing/print_view_manager_base.h
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
||||||
@@ -47,6 +47,8 @@ namespace printing {
|
@@ -47,6 +47,8 @@ namespace printing {
|
||||||
|
@ -491,8 +491,8 @@ index 0b07b29da7df2595270391aed19e6eecd53b9f02..a5fb7fb6aac719df0dfed116daf79831
|
||||||
// Adds and removes observers for `PrintViewManagerBase` events. The order in
|
// Adds and removes observers for `PrintViewManagerBase` events. The order in
|
||||||
// which notifications are sent to observers is undefined. Observers must be
|
// which notifications are sent to observers is undefined. Observers must be
|
||||||
@@ -141,6 +148,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
@@ -141,6 +148,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
||||||
void AddObserver(Observer& observer);
|
void AddTestObserver(TestObserver& observer);
|
||||||
void RemoveObserver(Observer& observer);
|
void RemoveTestObserver(TestObserver& observer);
|
||||||
|
|
||||||
+ enum class PrintStatus {
|
+ enum class PrintStatus {
|
||||||
+ kSucceeded,
|
+ kSucceeded,
|
||||||
|
@ -505,7 +505,7 @@ index 0b07b29da7df2595270391aed19e6eecd53b9f02..a5fb7fb6aac719df0dfed116daf79831
|
||||||
protected:
|
protected:
|
||||||
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
||||||
|
|
||||||
@@ -291,7 +306,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
@@ -293,7 +308,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
||||||
// Runs `callback` with `params` to reply to ScriptedPrint().
|
// Runs `callback` with `params` to reply to ScriptedPrint().
|
||||||
void ScriptedPrintReply(ScriptedPrintCallback callback,
|
void ScriptedPrintReply(ScriptedPrintCallback callback,
|
||||||
int process_id,
|
int process_id,
|
||||||
|
@ -515,7 +515,7 @@ index 0b07b29da7df2595270391aed19e6eecd53b9f02..a5fb7fb6aac719df0dfed116daf79831
|
||||||
|
|
||||||
// Requests the RenderView to render all the missing pages for the print job.
|
// Requests the RenderView to render all the missing pages for the print job.
|
||||||
// No-op if no print job is pending. Returns true if at least one page has
|
// No-op if no print job is pending. Returns true if at least one page has
|
||||||
@@ -361,8 +377,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
@@ -363,8 +379,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
||||||
// The current RFH that is printing with a system printing dialog.
|
// The current RFH that is printing with a system printing dialog.
|
||||||
raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
|
raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
|
||||||
|
|
||||||
|
@ -847,10 +847,10 @@ index d971e446859507456da153a9d59f3ed4857b66cb..9ab75731a941e7065dfaa481508cfa47
|
||||||
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
||||||
// Set options for print preset from source PDF document.
|
// Set options for print preset from source PDF document.
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index eb6f14f2f99b6939a593a1c9428c719c91382994..1af36377e3841270ddb5db056b17710aa890a3c8 100644
|
index e4e7240043050b3ca74645c52e021ee75019afc2..3177185f3adfd2bbb6ca6c6c8fdabde4cb90e839 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -2898,8 +2898,9 @@ source_set("browser") {
|
@@ -2901,8 +2901,9 @@ source_set("browser") {
|
||||||
"//ppapi/shared_impl",
|
"//ppapi/shared_impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ index b05c0157ecca222452fb38e3b28c9d7cc6bcfbfd..02d9eabfef9521722340739bf86df3df
|
||||||
base::win::MessageWindow window_; // The message-only window.
|
base::win::MessageWindow window_; // The message-only window.
|
||||||
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
|
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
|
||||||
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
||||||
index e1a955c90d6c9f2d5caf18c6bb32e5a388d566be..5330402b1df783b8258b09d8e8dfc2cdf3819437 100644
|
index c7c8f4c7f89073990c8fd6269ab83e75abd9ad7d..7cd73bf6d1884bd9b38bcb33de009efb1da2add9 100644
|
||||||
--- a/chrome/browser/process_singleton_posix.cc
|
--- a/chrome/browser/process_singleton_posix.cc
|
||||||
+++ b/chrome/browser/process_singleton_posix.cc
|
+++ b/chrome/browser/process_singleton_posix.cc
|
||||||
@@ -54,6 +54,7 @@
|
@@ -54,6 +54,7 @@
|
||||||
|
|
|
@ -44,10 +44,10 @@ index 90c6a5b6999571819ef71f859767cccf635ea883..d08149b8cb57ca357a2304fc9a8b8be4
|
||||||
|
|
||||||
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index cb5d09ff6c2347caac3c31f642be244937fdd284..8485102b60faadccbc463c8fc52499e2f865f3f9 100644
|
index fdd0eacf647dd9097bdb59ff408fcd46e078dd72..020dc08a3d8a83fe1f82e3f3ae65f2a18bd4935b 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4767,6 +4767,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
@@ -4768,6 +4768,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
||||||
return text_input_manager_.get();
|
return text_input_manager_.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
|
||||||
... something to do with OSR? and maybe <webview> as well? terrifying.
|
... something to do with OSR? and maybe <webview> as well? terrifying.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
index d770e7b922232d3e2697ba4146e2e4a3984d6757..5761c122a3fd201c2b53b9d98f21191cd71fa002 100644
|
index ed1488e08ccb1cb0c45a7ff5bb49bc5060462508..ad01511a8e44c4d6c4fb4a48cfbb7de36488f296 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||||
@@ -700,6 +700,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
|
@@ -680,6 +680,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ index d770e7b922232d3e2697ba4146e2e4a3984d6757..5761c122a3fd201c2b53b9d98f21191c
|
||||||
const blink::WebMouseEvent& event,
|
const blink::WebMouseEvent& event,
|
||||||
const ui::LatencyInfo& latency) {
|
const ui::LatencyInfo& latency) {
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
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 7b8afe19a30886bff552d9db3daf456f6a0012f9..524e266126cc2d8e17c1a32aa3863924b8626c2f 100644
|
index b299651c61e4e3fef4d9dcc4ce3a8e82372d309a..e7fcd137e296ca3c9529c5aa12cce18780160c9d 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
||||||
@@ -25,8 +25,11 @@
|
@@ -25,8 +25,11 @@
|
||||||
|
@ -60,7 +60,7 @@ index 7b8afe19a30886bff552d9db3daf456f6a0012f9..524e266126cc2d8e17c1a32aa3863924
|
||||||
class WebContentsAccessibility;
|
class WebContentsAccessibility;
|
||||||
class DelegatedFrameHost;
|
class DelegatedFrameHost;
|
||||||
|
|
||||||
@@ -148,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
@@ -141,6 +146,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
||||||
const gfx::Rect& keyboard_rect) override {}
|
const gfx::Rect& keyboard_rect) override {}
|
||||||
bool IsHTMLFormPopup() const override;
|
bool IsHTMLFormPopup() const override;
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ index 7b8afe19a30886bff552d9db3daf456f6a0012f9..524e266126cc2d8e17c1a32aa3863924
|
||||||
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
|
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
|
||||||
// that handle content embedded within other RenderWidgetHostViews.
|
// that handle content embedded within other RenderWidgetHostViews.
|
||||||
gfx::PointF TransformPointToRootCoordSpaceF(
|
gfx::PointF TransformPointToRootCoordSpaceF(
|
||||||
@@ -316,6 +324,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
@@ -309,6 +317,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView {
|
||||||
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
||||||
const ui::LatencyInfo& latency);
|
const ui::LatencyInfo& latency);
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
|
||||||
Patch to make scrollBounce option work.
|
Patch to make scrollBounce option work.
|
||||||
|
|
||||||
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
||||||
index 6b37ab029be690c4b773d54775730ea38181122c..67a98e4b6f8de2112c85e3786b4cdae112835a21 100644
|
index b1ad4bd6c61089badd7eda1d95592f3f5b190a1b..64c4adde22136baf053275e8cd4d097b027f1abe 100644
|
||||||
--- a/content/renderer/render_thread_impl.cc
|
--- a/content/renderer/render_thread_impl.cc
|
||||||
+++ b/content/renderer/render_thread_impl.cc
|
+++ b/content/renderer/render_thread_impl.cc
|
||||||
@@ -1361,7 +1361,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
@@ -1337,7 +1337,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
bool RenderThreadImpl::IsElasticOverscrollEnabled() {
|
||||||
|
|
|
@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
|
||||||
does touch a security-sensitive class.
|
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
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
index 17415e1009465f44b606236cd6e525e612d6ebe9..2fe11fd6f014cb5b415efe2ae1ba97efa94281c4 100644
|
index b95fda20552eda765f680786f79c65dd9fc06ecb..a8573d9c486d5c3b050af7fc896f31d56222b1a2 100644
|
||||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
@@ -1863,9 +1863,15 @@ bool RenderProcessHostImpl::Init() {
|
@@ -1905,9 +1905,15 @@ bool RenderProcessHostImpl::Init() {
|
||||||
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
||||||
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
|
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
|
||||||
*cmd_line, IsPdf(), IsJitDisabled());
|
*cmd_line, IsPdf(), IsJitDisabled());
|
||||||
|
|
|
@ -9,7 +9,7 @@ is needed for OSR.
|
||||||
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 525aee88cd77d7f5cb561a97fb79d0bfe2582176..a93df5a741dbf2eb99a454050e7f31c506d0ce8d 100644
|
index ce1eca1580ffa07a3fe3a7879351c2ad484c2a4d..fbae94d817d600df09052da88180d1e2a83361fa 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3221,6 +3221,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3221,6 +3221,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
|
|
|
@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
|
||||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
`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
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 3c2d6925829ef571949ee13234ddac23603950f5..e914fdc56f5fa80add4eef3e18213b2a9f5a18cb 100644
|
index 055b0bd53fea17e1df96f460aede20497d53216f..767205042a8e42b0420d618017eae83f449fa28b 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -7045,6 +7045,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -7046,6 +7046,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,10 @@ An attempt to upstream this was made, but rejected:
|
||||||
https://chromium-review.googlesource.com/c/chromium/src/+/1954347
|
https://chromium-review.googlesource.com/c/chromium/src/+/1954347
|
||||||
|
|
||||||
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
||||||
index 834a07bb92d77eceb37d0378e9fe2bf13a74a64d..13815369562c1f78c2411cde8e14d9e8795eff38 100644
|
index a4130ad4dc8158f8256b55fdd87f577687135626..3139aa65807cee23f0e8dbc85243566ef9de89b9 100644
|
||||||
--- a/content/public/renderer/content_renderer_client.h
|
--- a/content/public/renderer/content_renderer_client.h
|
||||||
+++ b/content/public/renderer/content_renderer_client.h
|
+++ b/content/public/renderer/content_renderer_client.h
|
||||||
@@ -371,6 +371,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
@@ -376,6 +376,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||||
virtual void DidInitializeWorkerContextOnWorkerThread(
|
virtual void DidInitializeWorkerContextOnWorkerThread(
|
||||||
v8::Local<v8::Context> context) {}
|
v8::Local<v8::Context> context) {}
|
||||||
|
|
||||||
|
@ -26,10 +26,10 @@ index 834a07bb92d77eceb37d0378e9fe2bf13a74a64d..13815369562c1f78c2411cde8e14d9e8
|
||||||
// An empty URL is returned if the URL is not overriden.
|
// An empty URL is returned if the URL is not overriden.
|
||||||
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
|
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
index a790f204157bb76c90fefac15110f940ed7f1194..696ad0eac2b187517ad737ec733a4bae2a0993f0 100644
|
index 134a4b1f1ce8f4771bfaaf7592343f59f851e1c7..f5faa3686173ffd22c3b106872a4b86ab8cbe3de 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.cc
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
@@ -813,6 +813,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
@@ -792,6 +792,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
||||||
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,10 +43,10 @@ index a790f204157bb76c90fefac15110f940ed7f1194..696ad0eac2b187517ad737ec733a4bae
|
||||||
const v8::Local<v8::Context>& worker) {
|
const v8::Local<v8::Context>& worker) {
|
||||||
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
|
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
||||||
index 278defce6db13bdfca7faad1edd8b9ed97fa6ba0..1ba3b8a4b85a274e3f53968f4f68766796440555 100644
|
index 587565fa2fd5d677f77ed1a44cb39a9e3007c221..9b234f2ea8daa9300c2a41f7001b140c52ac5c0f 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.h
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.h
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
||||||
@@ -175,6 +175,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -173,6 +173,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||||
void DidStartWorkerThread() override;
|
void DidStartWorkerThread() override;
|
||||||
void WillStopWorkerThread() override;
|
void WillStopWorkerThread() override;
|
||||||
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
||||||
|
@ -55,10 +55,10 @@ index 278defce6db13bdfca7faad1edd8b9ed97fa6ba0..1ba3b8a4b85a274e3f53968f4f687667
|
||||||
const blink::WebSecurityOrigin& script_origin) override;
|
const blink::WebSecurityOrigin& script_origin) override;
|
||||||
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
|
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
|
||||||
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
||||||
index f44407557557343d9ecbf3b3e1115f57fe77e1bb..77c31b107cb0786248510e64f019cdb92b4fb4af 100644
|
index 2d99d8aff36e3687e788f0b23b1e30dd881d70e3..ea6c75433f4e4092d77f938dff1cbf2671643400 100644
|
||||||
--- a/third_party/blink/public/platform/platform.h
|
--- a/third_party/blink/public/platform/platform.h
|
||||||
+++ b/third_party/blink/public/platform/platform.h
|
+++ b/third_party/blink/public/platform/platform.h
|
||||||
@@ -621,6 +621,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
@@ -617,6 +617,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||||
virtual void DidStartWorkerThread() {}
|
virtual void DidStartWorkerThread() {}
|
||||||
virtual void WillStopWorkerThread() {}
|
virtual void WillStopWorkerThread() {}
|
||||||
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
||||||
|
|
|
@ -19,10 +19,10 @@ that clearly establishes the worker script is ready for evaluation with the scop
|
||||||
initialized.
|
initialized.
|
||||||
|
|
||||||
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
||||||
index 13815369562c1f78c2411cde8e14d9e8795eff38..42a3226c270b39658306db0b39df24b891086b21 100644
|
index 3139aa65807cee23f0e8dbc85243566ef9de89b9..19707edb1283f2432f3c0059f80fabd5ce8bdbd8 100644
|
||||||
--- a/content/public/renderer/content_renderer_client.h
|
--- a/content/public/renderer/content_renderer_client.h
|
||||||
+++ b/content/public/renderer/content_renderer_client.h
|
+++ b/content/public/renderer/content_renderer_client.h
|
||||||
@@ -371,6 +371,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
@@ -376,6 +376,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||||
virtual void DidInitializeWorkerContextOnWorkerThread(
|
virtual void DidInitializeWorkerContextOnWorkerThread(
|
||||||
v8::Local<v8::Context> context) {}
|
v8::Local<v8::Context> context) {}
|
||||||
|
|
||||||
|
@ -35,10 +35,10 @@ index 13815369562c1f78c2411cde8e14d9e8795eff38..42a3226c270b39658306db0b39df24b8
|
||||||
// from the worker thread.
|
// from the worker thread.
|
||||||
virtual void WillDestroyWorkerContextOnWorkerThread(
|
virtual void WillDestroyWorkerContextOnWorkerThread(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
index 696ad0eac2b187517ad737ec733a4bae2a0993f0..aa08e6c2b754b405f847c233b9d83ae08384754b 100644
|
index f5faa3686173ffd22c3b106872a4b86ab8cbe3de..d303895c4f6a94e0c518178d01e7947247b70ed6 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.cc
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
@@ -825,6 +825,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
@@ -804,6 +804,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
||||||
worker);
|
worker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,10 +52,10 @@ index 696ad0eac2b187517ad737ec733a4bae2a0993f0..aa08e6c2b754b405f847c233b9d83ae0
|
||||||
const blink::WebSecurityOrigin& script_origin) {
|
const blink::WebSecurityOrigin& script_origin) {
|
||||||
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
|
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
||||||
index 1ba3b8a4b85a274e3f53968f4f68766796440555..c9dfaab647d191dba58da5bb95ba1ab703115b05 100644
|
index 9b234f2ea8daa9300c2a41f7001b140c52ac5c0f..7b666ae7276f6393b4ce7390e811c0c4ccbc74e1 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.h
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.h
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
||||||
@@ -175,6 +175,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -173,6 +173,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||||
void DidStartWorkerThread() override;
|
void DidStartWorkerThread() override;
|
||||||
void WillStopWorkerThread() override;
|
void WillStopWorkerThread() override;
|
||||||
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
||||||
|
@ -65,10 +65,10 @@ index 1ba3b8a4b85a274e3f53968f4f68766796440555..c9dfaab647d191dba58da5bb95ba1ab7
|
||||||
bool AllowScriptExtensionForServiceWorker(
|
bool AllowScriptExtensionForServiceWorker(
|
||||||
const blink::WebSecurityOrigin& script_origin) override;
|
const blink::WebSecurityOrigin& script_origin) override;
|
||||||
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
||||||
index 77c31b107cb0786248510e64f019cdb92b4fb4af..80f05e60b3f18da708840804501b69328c95a083 100644
|
index ea6c75433f4e4092d77f938dff1cbf2671643400..f5306fc986340c519dcb6fa0920b544cc927a30b 100644
|
||||||
--- a/third_party/blink/public/platform/platform.h
|
--- a/third_party/blink/public/platform/platform.h
|
||||||
+++ b/third_party/blink/public/platform/platform.h
|
+++ b/third_party/blink/public/platform/platform.h
|
||||||
@@ -621,6 +621,8 @@ class BLINK_PLATFORM_EXPORT Platform {
|
@@ -617,6 +617,8 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||||
virtual void DidStartWorkerThread() {}
|
virtual void DidStartWorkerThread() {}
|
||||||
virtual void WillStopWorkerThread() {}
|
virtual void WillStopWorkerThread() {}
|
||||||
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
||||||
|
|
|
@ -9,10 +9,10 @@ necessary for native modules to load.
|
||||||
Also change visibility on mksnapshot in order to target mksnapshot for mksnapshot zip.
|
Also change visibility on mksnapshot in order to target mksnapshot for mksnapshot zip.
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index fe654f0f5dedfc06a72c008728215f5ec0feace6..b52ac02c1e3e85663a1fb97f0db7415fc6666dbd 100644
|
index bba6e5665575e2f974a44d73279996d86ef7c94f..5bba6e30da5fb43940f10465faaf9b15636b808e 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -704,7 +704,7 @@ config("internal_config") {
|
@@ -715,7 +715,7 @@ config("internal_config") {
|
||||||
":cppgc_header_features",
|
":cppgc_header_features",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ index fe654f0f5dedfc06a72c008728215f5ec0feace6..b52ac02c1e3e85663a1fb97f0db7415f
|
||||||
defines += [ "BUILDING_V8_SHARED" ]
|
defines += [ "BUILDING_V8_SHARED" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6517,7 +6517,7 @@ if (current_toolchain == v8_generator_toolchain) {
|
@@ -6539,7 +6539,7 @@ if (current_toolchain == v8_generator_toolchain) {
|
||||||
"src/interpreter/bytecodes.h",
|
"src/interpreter/bytecodes.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ index fe654f0f5dedfc06a72c008728215f5ec0feace6..b52ac02c1e3e85663a1fb97f0db7415f
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
":v8_libbase",
|
":v8_libbase",
|
||||||
@@ -6529,7 +6529,6 @@ if (current_toolchain == v8_generator_toolchain) {
|
@@ -6551,7 +6551,6 @@ if (current_toolchain == v8_generator_toolchain) {
|
||||||
|
|
||||||
if (current_toolchain == v8_snapshot_toolchain) {
|
if (current_toolchain == v8_snapshot_toolchain) {
|
||||||
v8_executable("mksnapshot") {
|
v8_executable("mksnapshot") {
|
||||||
|
|
|
@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
|
||||||
contain any standard C++ library exports (e.g. `std::ostringstream`).
|
contain any standard C++ library exports (e.g. `std::ostringstream`).
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index b52ac02c1e3e85663a1fb97f0db7415fc6666dbd..d91bfc3492e3af4cfaa9376a21ed4014c665dfc7 100644
|
index 5bba6e30da5fb43940f10465faaf9b15636b808e..f7160f2333c016c2cd9ead5aa66a9e971e139b97 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -704,6 +704,10 @@ config("internal_config") {
|
@@ -715,6 +715,10 @@ config("internal_config") {
|
||||||
":cppgc_header_features",
|
":cppgc_header_features",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
#if BUILDFLAG(IS_LINUX)
|
#if BUILDFLAG(IS_LINUX)
|
||||||
#include "base/containers/span.h"
|
#include "base/containers/span.h"
|
||||||
#include "base/files/file_util.h"
|
#include "base/files/file_util.h"
|
||||||
#include "base/guid.h"
|
#include "base/uuid.h"
|
||||||
#include "components/crash/core/common/crash_keys.h"
|
#include "components/crash/core/common/crash_keys.h"
|
||||||
#include "components/upload_list/combining_upload_list.h"
|
#include "components/upload_list/combining_upload_list.h"
|
||||||
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
#include "v8/include/v8-wasm-trap-handler-posix.h"
|
||||||
|
@ -117,7 +117,7 @@ std::string GetClientId() {
|
||||||
return *client_id;
|
return *client_id;
|
||||||
*client_id = ReadClientId();
|
*client_id = ReadClientId();
|
||||||
if (client_id->empty()) {
|
if (client_id->empty()) {
|
||||||
*client_id = base::GenerateGUID();
|
*client_id = base::Uuid::GenerateRandomV4().AsLowercaseString();
|
||||||
WriteClientId(*client_id);
|
WriteClientId(*client_id);
|
||||||
}
|
}
|
||||||
return *client_id;
|
return *client_id;
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#include "shell/browser/api/electron_api_notification.h"
|
#include "shell/browser/api/electron_api_notification.h"
|
||||||
|
|
||||||
#include "base/guid.h"
|
|
||||||
#include "base/strings/utf_string_conversions.h"
|
#include "base/strings/utf_string_conversions.h"
|
||||||
|
#include "base/uuid.h"
|
||||||
#include "gin/handle.h"
|
#include "gin/handle.h"
|
||||||
#include "shell/browser/api/electron_api_menu.h"
|
#include "shell/browser/api/electron_api_menu.h"
|
||||||
#include "shell/browser/browser.h"
|
#include "shell/browser/browser.h"
|
||||||
|
@ -226,7 +226,8 @@ void Notification::Close() {
|
||||||
void Notification::Show() {
|
void Notification::Show() {
|
||||||
Close();
|
Close();
|
||||||
if (presenter_) {
|
if (presenter_) {
|
||||||
notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
|
notification_ = presenter_->CreateNotification(
|
||||||
|
this, base::Uuid::GenerateRandomV4().AsLowercaseString());
|
||||||
if (notification_) {
|
if (notification_) {
|
||||||
electron::NotificationOptions options;
|
electron::NotificationOptions options;
|
||||||
options.title = title_;
|
options.title = title_;
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
#include "base/files/file_enumerator.h"
|
#include "base/files/file_enumerator.h"
|
||||||
#include "base/files/file_path.h"
|
#include "base/files/file_path.h"
|
||||||
#include "base/files/file_util.h"
|
#include "base/files/file_util.h"
|
||||||
#include "base/guid.h"
|
|
||||||
#include "base/memory/raw_ptr.h"
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "base/strings/string_number_conversions.h"
|
#include "base/strings/string_number_conversions.h"
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
#include "base/strings/stringprintf.h"
|
#include "base/strings/stringprintf.h"
|
||||||
|
#include "base/uuid.h"
|
||||||
#include "chrome/browser/browser_process.h"
|
#include "chrome/browser/browser_process.h"
|
||||||
#include "chrome/common/chrome_switches.h"
|
#include "chrome/common/chrome_switches.h"
|
||||||
#include "chrome/common/pref_names.h"
|
#include "chrome/common/pref_names.h"
|
||||||
|
@ -277,7 +277,8 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
|
||||||
const base::Time& start_time,
|
const base::Time& start_time,
|
||||||
uint32_t id) {
|
uint32_t id) {
|
||||||
download_manager->CreateDownloadItem(
|
download_manager->CreateDownloadItem(
|
||||||
base::GenerateGUID(), id, path, path, url_chain, GURL(),
|
base::Uuid::GenerateRandomV4().AsLowercaseString(), id, path, path,
|
||||||
|
url_chain, GURL(),
|
||||||
content::StoragePartitionConfig::CreateDefault(
|
content::StoragePartitionConfig::CreateDefault(
|
||||||
download_manager->GetBrowserContext()),
|
download_manager->GetBrowserContext()),
|
||||||
GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
|
GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
|
||||||
|
|
|
@ -1364,7 +1364,9 @@ bool ElectronBrowserClient::WillCreateURLLoaderFactory(
|
||||||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||||
ElectronBrowserClient::WillCreateURLLoaderRequestInterceptors(
|
ElectronBrowserClient::WillCreateURLLoaderRequestInterceptors(
|
||||||
content::NavigationUIData* navigation_ui_data,
|
content::NavigationUIData* navigation_ui_data,
|
||||||
int frame_tree_node_id) {
|
int frame_tree_node_id,
|
||||||
|
int64_t navigation_id,
|
||||||
|
scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner) {
|
||||||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||||
interceptors;
|
interceptors;
|
||||||
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
||||||
|
|
|
@ -234,7 +234,10 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
|
||||||
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
std::vector<std::unique_ptr<content::URLLoaderRequestInterceptor>>
|
||||||
WillCreateURLLoaderRequestInterceptors(
|
WillCreateURLLoaderRequestInterceptors(
|
||||||
content::NavigationUIData* navigation_ui_data,
|
content::NavigationUIData* navigation_ui_data,
|
||||||
int frame_tree_node_id) override;
|
int frame_tree_node_id,
|
||||||
|
int64_t navigation_id,
|
||||||
|
scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner)
|
||||||
|
override;
|
||||||
bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
|
bool ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
|
||||||
base::StringPiece scheme,
|
base::StringPiece scheme,
|
||||||
bool is_embedded_origin_secure) override;
|
bool is_embedded_origin_secure) override;
|
||||||
|
@ -330,7 +333,7 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
|
||||||
web_authentication_delegate_;
|
web_authentication_delegate_;
|
||||||
|
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
ElectronBrowserMainParts* browser_main_parts_ = nullptr;
|
raw_ptr<ElectronBrowserMainParts> browser_main_parts_ = nullptr;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -9,9 +9,9 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include "base/guid.h"
|
|
||||||
#include "base/strings/string_number_conversions.h"
|
#include "base/strings/string_number_conversions.h"
|
||||||
#include "base/strings/stringprintf.h"
|
#include "base/strings/stringprintf.h"
|
||||||
|
#include "base/uuid.h"
|
||||||
#include "content/public/browser/browser_thread.h"
|
#include "content/public/browser/browser_thread.h"
|
||||||
#include "content/public/browser/storage_partition.h"
|
#include "content/public/browser/storage_partition.h"
|
||||||
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
#include "mojo/public/cpp/system/data_pipe_producer.h"
|
||||||
|
@ -552,8 +552,8 @@ void ElectronURLLoaderFactory::StartLoadingHttp(
|
||||||
v8::Local<v8::Value> value;
|
v8::Local<v8::Value> value;
|
||||||
if (dict.Get("session", &value)) {
|
if (dict.Get("session", &value)) {
|
||||||
if (value->IsNull()) {
|
if (value->IsNull()) {
|
||||||
browser_context =
|
browser_context = ElectronBrowserContext::From(
|
||||||
ElectronBrowserContext::From(base::GenerateGUID(), true);
|
base::Uuid::GenerateRandomV4().AsLowercaseString(), true);
|
||||||
} else {
|
} else {
|
||||||
gin::Handle<api::Session> session;
|
gin::Handle<api::Session> session;
|
||||||
if (gin::ConvertFromV8(dict.isolate(), value, &session) &&
|
if (gin::ConvertFromV8(dict.isolate(), value, &session) &&
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
|
|
||||||
#import <Foundation/Foundation.h>
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
|
|
||||||
namespace electron {
|
namespace electron {
|
||||||
class NotificationPresenterMac;
|
class NotificationPresenterMac;
|
||||||
}
|
}
|
||||||
|
@ -14,7 +16,7 @@ class NotificationPresenterMac;
|
||||||
@interface NotificationCenterDelegate
|
@interface NotificationCenterDelegate
|
||||||
: NSObject <NSUserNotificationCenterDelegate> {
|
: NSObject <NSUserNotificationCenterDelegate> {
|
||||||
@private
|
@private
|
||||||
electron::NotificationPresenterMac* presenter_;
|
raw_ptr<electron::NotificationPresenterMac> presenter_;
|
||||||
}
|
}
|
||||||
- (instancetype)initWithPresenter:
|
- (instancetype)initWithPresenter:
|
||||||
(electron::NotificationPresenterMac*)presenter;
|
(electron::NotificationPresenterMac*)presenter;
|
||||||
|
|
|
@ -43,7 +43,7 @@ void LayeredWindowUpdater::OnAllocatedSharedMemory(
|
||||||
// Make sure |pixel_size| is sane.
|
// Make sure |pixel_size| is sane.
|
||||||
size_t expected_bytes;
|
size_t expected_bytes;
|
||||||
bool size_result = viz::ResourceSizes::MaybeSizeInBytes(
|
bool size_result = viz::ResourceSizes::MaybeSizeInBytes(
|
||||||
pixel_size, viz::ResourceFormat::RGBA_8888, &expected_bytes);
|
pixel_size, viz::SinglePlaneFormat::kRGBA_8888, &expected_bytes);
|
||||||
if (!size_result)
|
if (!size_result)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "shell/browser/native_window_observer.h"
|
#include "shell/browser/native_window_observer.h"
|
||||||
|
|
||||||
#include "base/memory/raw_ptr.h"
|
#include "base/memory/raw_ptr.h"
|
||||||
|
#include "base/memory/raw_ptr_exclusion.h"
|
||||||
#include "content/browser/renderer_host/render_view_host_delegate_view.h" // nogncheck
|
#include "content/browser/renderer_host/render_view_host_delegate_view.h" // nogncheck
|
||||||
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
|
#include "content/browser/web_contents/web_contents_view.h" // nogncheck
|
||||||
#include "content/public/browser/web_contents.h"
|
#include "content/public/browser/web_contents.h"
|
||||||
|
@ -104,7 +105,7 @@ class OffScreenWebContentsView : public content::WebContentsView,
|
||||||
raw_ptr<content::WebContents> web_contents_ = nullptr;
|
raw_ptr<content::WebContents> web_contents_ = nullptr;
|
||||||
|
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
OffScreenView* offScreenView_;
|
RAW_PTR_EXCLUSION OffScreenView* offScreenView_;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#include "base/apple/owned_objc.h"
|
#include "base/apple/owned_objc.h"
|
||||||
#include "base/mac/scoped_nsobject.h"
|
#include "base/mac/scoped_nsobject.h"
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
|
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
|
||||||
#include "ui/base/cocoa/base_view.h"
|
#include "ui/base/cocoa/base_view.h"
|
||||||
|
|
||||||
|
@ -24,7 +25,7 @@ using electron::InspectableWebContentsViewMac;
|
||||||
|
|
||||||
@interface ElectronInspectableWebContentsView : BaseView <NSWindowDelegate> {
|
@interface ElectronInspectableWebContentsView : BaseView <NSWindowDelegate> {
|
||||||
@private
|
@private
|
||||||
electron::InspectableWebContentsViewMac* inspectableWebContentsView_;
|
raw_ptr<electron::InspectableWebContentsViewMac> inspectableWebContentsView_;
|
||||||
|
|
||||||
base::scoped_nsobject<NSView> fake_view_;
|
base::scoped_nsobject<NSView> fake_view_;
|
||||||
base::scoped_nsobject<NSWindow> devtools_window_;
|
base::scoped_nsobject<NSWindow> devtools_window_;
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "ui/views/widget/native_widget_mac.h"
|
#include "ui/views/widget/native_widget_mac.h"
|
||||||
|
|
||||||
namespace electron {
|
namespace electron {
|
||||||
|
@ -31,7 +32,7 @@ class ElectronNativeWidgetMac : public views::NativeWidgetMac {
|
||||||
const remote_cocoa::mojom::CreateWindowParams* params) override;
|
const remote_cocoa::mojom::CreateWindowParams* params) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
NativeWindowMac* shell_;
|
raw_ptr<NativeWindowMac> shell_;
|
||||||
std::string window_type_;
|
std::string window_type_;
|
||||||
NSUInteger style_mask_;
|
NSUInteger style_mask_;
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
|
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
|
||||||
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
|
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ELECTRON_NS_WINDOW_H_
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h"
|
#include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h"
|
||||||
#include "shell/browser/ui/cocoa/event_dispatching_window.h"
|
#include "shell/browser/ui/cocoa/event_dispatching_window.h"
|
||||||
#include "ui/views/widget/native_widget_mac.h"
|
#include "ui/views/widget/native_widget_mac.h"
|
||||||
|
@ -30,7 +31,7 @@ class ScopedDisableResize {
|
||||||
|
|
||||||
@interface ElectronNSWindow : NativeWidgetMacNSWindow {
|
@interface ElectronNSWindow : NativeWidgetMacNSWindow {
|
||||||
@private
|
@private
|
||||||
electron::NativeWindowMac* shell_;
|
raw_ptr<electron::NativeWindowMac> shell_;
|
||||||
}
|
}
|
||||||
@property BOOL acceptsFirstMouse;
|
@property BOOL acceptsFirstMouse;
|
||||||
@property BOOL enableLargerThanScreen;
|
@property BOOL enableLargerThanScreen;
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
#include <Quartz/Quartz.h>
|
#include <Quartz/Quartz.h>
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "components/remote_cocoa/app_shim/views_nswindow_delegate.h"
|
#include "components/remote_cocoa/app_shim/views_nswindow_delegate.h"
|
||||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||||
|
|
||||||
|
@ -17,7 +18,7 @@ class NativeWindowMac;
|
||||||
@interface ElectronNSWindowDelegate
|
@interface ElectronNSWindowDelegate
|
||||||
: ViewsNSWindowDelegate <NSTouchBarDelegate, QLPreviewPanelDataSource> {
|
: ViewsNSWindowDelegate <NSTouchBarDelegate, QLPreviewPanelDataSource> {
|
||||||
@private
|
@private
|
||||||
electron::NativeWindowMac* shell_;
|
raw_ptr<electron::NativeWindowMac> shell_;
|
||||||
bool is_zooming_;
|
bool is_zooming_;
|
||||||
int level_;
|
int level_;
|
||||||
bool is_resizable_;
|
bool is_resizable_;
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "base/mac/scoped_nsobject.h"
|
#include "base/mac/scoped_nsobject.h"
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "shell/browser/native_window.h"
|
#include "shell/browser/native_window.h"
|
||||||
#include "shell/common/gin_helper/persistent_dictionary.h"
|
#include "shell/common/gin_helper/persistent_dictionary.h"
|
||||||
|
|
||||||
|
@ -22,7 +23,7 @@
|
||||||
std::vector<gin_helper::PersistentDictionary> ordered_settings_;
|
std::vector<gin_helper::PersistentDictionary> ordered_settings_;
|
||||||
std::map<std::string, gin_helper::PersistentDictionary> settings_;
|
std::map<std::string, gin_helper::PersistentDictionary> settings_;
|
||||||
id<NSTouchBarDelegate> delegate_;
|
id<NSTouchBarDelegate> delegate_;
|
||||||
electron::NativeWindow* window_;
|
raw_ptr<electron::NativeWindow> window_;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id)initWithDelegate:(id<NSTouchBarDelegate>)delegate
|
- (id)initWithDelegate:(id<NSTouchBarDelegate>)delegate
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
|
#ifndef ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
|
||||||
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
|
#define ELECTRON_SHELL_BROWSER_UI_COCOA_ROOT_VIEW_MAC_H_
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "ui/views/view.h"
|
#include "ui/views/view.h"
|
||||||
|
|
||||||
namespace electron {
|
namespace electron {
|
||||||
|
@ -27,7 +28,7 @@ class RootViewMac : public views::View {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Parent window, weak ref.
|
// Parent window, weak ref.
|
||||||
NativeWindow* window_;
|
raw_ptr<NativeWindow> window_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace electron
|
} // namespace electron
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#include "base/base64.h"
|
#include "base/base64.h"
|
||||||
#include "base/guid.h"
|
|
||||||
#include "base/json/json_reader.h"
|
#include "base/json/json_reader.h"
|
||||||
#include "base/json/json_writer.h"
|
#include "base/json/json_writer.h"
|
||||||
#include "base/json/string_escape.h"
|
#include "base/json/string_escape.h"
|
||||||
|
@ -20,6 +19,7 @@
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
#include "base/strings/stringprintf.h"
|
#include "base/strings/stringprintf.h"
|
||||||
#include "base/strings/utf_string_conversions.h"
|
#include "base/strings/utf_string_conversions.h"
|
||||||
|
#include "base/uuid.h"
|
||||||
#include "base/values.h"
|
#include "base/values.h"
|
||||||
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
|
#include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
|
||||||
#include "components/prefs/pref_registry_simple.h"
|
#include "components/prefs/pref_registry_simple.h"
|
||||||
|
@ -1044,8 +1044,9 @@ void InspectableWebContents::DidFinishNavigation(
|
||||||
// most likely bug in chromium.
|
// most likely bug in chromium.
|
||||||
base::ReplaceFirstSubstringAfterOffset(&it->second, 0, "var chrome",
|
base::ReplaceFirstSubstringAfterOffset(&it->second, 0, "var chrome",
|
||||||
"var chrome = window.chrome ");
|
"var chrome = window.chrome ");
|
||||||
auto script = base::StringPrintf("%s(\"%s\")", it->second.c_str(),
|
auto script = base::StringPrintf(
|
||||||
base::GenerateGUID().c_str());
|
"%s(\"%s\")", it->second.c_str(),
|
||||||
|
base::Uuid::GenerateRandomV4().AsLowercaseString().c_str());
|
||||||
// Invoking content::DevToolsFrontendHost::SetupExtensionsAPI(frame, script);
|
// Invoking content::DevToolsFrontendHost::SetupExtensionsAPI(frame, script);
|
||||||
// should be enough, but it seems to be a noop currently.
|
// should be enough, but it seems to be a noop currently.
|
||||||
frame->ExecuteJavaScriptForTests(base::UTF8ToUTF16(script),
|
frame->ExecuteJavaScriptForTests(base::UTF8ToUTF16(script),
|
||||||
|
|
|
@ -133,6 +133,11 @@ class InspectableWebContents
|
||||||
void OpenNodeFrontend() override;
|
void OpenNodeFrontend() override;
|
||||||
void DispatchProtocolMessageFromDevToolsFrontend(
|
void DispatchProtocolMessageFromDevToolsFrontend(
|
||||||
const std::string& message) override;
|
const std::string& message) override;
|
||||||
|
void RecordCountHistogram(const std::string& name,
|
||||||
|
int sample,
|
||||||
|
int min,
|
||||||
|
int exclusive_max,
|
||||||
|
int buckets) override {}
|
||||||
void SendJsonRequest(DispatchCallback callback,
|
void SendJsonRequest(DispatchCallback callback,
|
||||||
const std::string& browser_id,
|
const std::string& browser_id,
|
||||||
const std::string& url) override;
|
const std::string& url) override;
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
#include "base/message_loop/message_pump_mac.h"
|
#include "base/message_loop/message_pump_mac.h"
|
||||||
#include "base/strings/sys_string_conversions.h"
|
#include "base/strings/sys_string_conversions.h"
|
||||||
#include "base/task/current_thread.h"
|
#include "base/task/current_thread.h"
|
||||||
|
@ -19,8 +20,8 @@
|
||||||
#include "ui/native_theme/native_theme.h"
|
#include "ui/native_theme/native_theme.h"
|
||||||
|
|
||||||
@interface StatusItemView : NSView {
|
@interface StatusItemView : NSView {
|
||||||
electron::TrayIconCocoa* trayIcon_; // weak
|
raw_ptr<electron::TrayIconCocoa> trayIcon_; // weak
|
||||||
ElectronMenuController* menuController_; // weak
|
ElectronMenuController* menuController_; // weak
|
||||||
BOOL ignoreDoubleClickEvents_;
|
BOOL ignoreDoubleClickEvents_;
|
||||||
base::scoped_nsobject<NSStatusItem> statusItem_;
|
base::scoped_nsobject<NSStatusItem> statusItem_;
|
||||||
base::scoped_nsobject<NSTrackingArea> trackingArea_;
|
base::scoped_nsobject<NSTrackingArea> trackingArea_;
|
||||||
|
|
Loading…
Add table
Reference in a new issue