github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 76.0.3809.80 (6-0-x) (#19381)

Browse Source 
* chore: bump chromium in DEPS to 76.0.3809.78

* chore: update patches

* [Mac] Create a new helper process variant for the GPU.

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

* chore: bump chromium in DEPS to 76.0.3809.80
This commit is contained in:
Electron Bot
2019-07-24 10:49:37 -07:00
committed by Shelley Vohr
parent eab462f7cf
commit 0aec64960b
27 changed files with 97 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -10,7 +10,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'76.0.3809.77',
'76.0.3809.80',
'node_version':
'v12.4.0',

7
atom/app/atom_main_delegate_mac.mm
View File

@@ -27,14 +27,17 @@ base::FilePath GetFrameworksPath() {
base::FilePath GetHelperAppPath(const base::FilePath& frameworks_path,
const std::string& name) {
// Figure out what helper we are running
// Figure out what helper we are running
base::FilePath path;
base::PathService::Get(base::FILE_EXE, &path);
std::string helper_name = "Helper";
std::string helper_name = "Helper";
if (base::EndsWith(path.value(), content::kMacHelperSuffix_renderer,
base::CompareCase::SENSITIVE)) {
helper_name += content::kMacHelperSuffix_renderer;
} else if (base::EndsWith(path.value(), content::kMacHelperSuffix_gpu,
base::CompareCase::SENSITIVE)) {
helper_name += content::kMacHelperSuffix_gpu;
} else if (base::EndsWith(path.value(), content::kMacHelperSuffix_plugin,
base::CompareCase::SENSITIVE)) {
helper_name += content::kMacHelperSuffix_plugin;

25
atom/browser/atom_browser_client.cc
View File

@@ -480,21 +480,28 @@ void AtomBrowserClient::AppendExtraCommandLineSwitches(
int process_id) {
// Make sure we're about to launch a known executable
{
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::FilePath child_path;
base::FilePath program =
base::MakeAbsoluteFilePath(command_line->GetProgram());
#if defined(OS_MACOSX)
int flags = content::ChildProcessHost::CHILD_NORMAL;
if (base::EndsWith(command_line->GetProgram().value(),
content::kMacHelperSuffix_renderer,
base::CompareCase::SENSITIVE)) {
flags = content::ChildProcessHost::CHILD_RENDERER;
auto renderer_child_path = content::ChildProcessHost::GetChildPath(
content::ChildProcessHost::CHILD_RENDERER);
auto gpu_child_path = content::ChildProcessHost::GetChildPath(
content::ChildProcessHost::CHILD_GPU);
auto plugin_child_path = content::ChildProcessHost::GetChildPath(
content::ChildProcessHost::CHILD_PLUGIN);
if (program != renderer_child_path && program != gpu_child_path &&
program != plugin_child_path) {
child_path = content::ChildProcessHost::GetChildPath(
content::ChildProcessHost::CHILD_NORMAL);
CHECK_EQ(program, child_path)
<< "Aborted from launching unexpected helper executable";
}
child_path = content::ChildProcessHost::GetChildPath(flags);
#else
base::PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
CHECK_EQ(program, child_path);
#endif
base::ThreadRestrictions::ScopedAllowIO allow_io;
CHECK(base::MakeAbsoluteFilePath(command_line->GetProgram()) == child_path);
}
std::string process_type =

6
atom/common/mac/main_application_bundle.mm
View File

@@ -33,9 +33,11 @@ base::FilePath MainApplicationBundlePath() {
if (!HasMainProcessKey() &&
(base::EndsWith(path.value(), " Helper", base::CompareCase::SENSITIVE) ||
base::EndsWith(path.value(), content::kMacHelperSuffix_renderer,
base::CompareCase::SENSITIVE) ||
base::CompareCase::SENSITIVE) ||
base::EndsWith(path.value(), content::kMacHelperSuffix_gpu,
base::CompareCase::SENSITIVE) ||
base::EndsWith(path.value(), content::kMacHelperSuffix_plugin,
base::CompareCase::SENSITIVE))) {
base::CompareCase::SENSITIVE))) {
// The running executable is the helper. Go up five steps:
// Contents/Frameworks/Helper.app/Contents/MacOS/Helper
// ^ to here ^ from here

2
patches/common/boringssl/expose_ripemd160.patch
View File

@@ -80,7 +80,7 @@ index d540144b293297791c087e0b968a47d368a73695..53cb9d2dc8f1962a70dc12b648d27c32
+ callback(EVP_ripemd160(), "ripemd160", NULL, arg);
}
diff --git a/include/openssl/digest.h b/include/openssl/digest.h
index 1a1ca29732afae317c8e8740c629e8922fc83093..48ebdd1eb93b3febecddbc2545b7aae583f21525 100644
index c7c679760a30329311b4a6c0db475b2375537028..991fa00b8330a663625719436075bcc8ae32e17a 100644
--- a/include/openssl/digest.h
+++ b/include/openssl/digest.h
@@ -88,6 +88,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_sha512(void);

4
patches/common/chromium/add_realloc.patch
View File

@@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 1f3f5e263585fbec3844b45116797084483006cb..8e13c4edbf98f380ddacad6447c4e0656fcb0bb2 100644
index 9ed1767443c793007f0576ed8aa35d1ca0f9e8d5..6cdbed8ef6ed604985de9ae6ddfb00d8aa4c20a2 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -553,6 +553,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -580,6 +580,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}

6
patches/common/chromium/can_create_window.patch
View File

@@ -5,7 +5,7 @@ Subject: can_create_window.patch
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a68f8d369cc661b93780d1ac47456bc51ee8a194..b069caa25093ba92b1fa3fbf1287d8e86ae6c4d2 100644
index bd596fdc462863fe881fb5d467cc4bbde6b87752..8f3d06ecb443c3c50bf5caacce167b9206eecf92 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3761,6 +3761,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -32,7 +32,7 @@ index 577fd09ef05584962b5357028702d54f36719c6a..6dd3dcb250a5744d62b13b0ee5544d82
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index f4c61acba134daf907a1b9afaaf0327a183287e4..d15061de5254fd4f248fed92f47a1b1fcf34cd68 100644
index 42247de8ab164585ede2e2cac6e848d9b0e4a555..aff110b0e5b90ef10445f8fcabfba2d6acabc8d9 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -519,6 +519,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -45,7 +45,7 @@ index f4c61acba134daf907a1b9afaaf0327a183287e4..d15061de5254fd4f248fed92f47a1b1f
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 1a16897afa4457319518bce5341a6e1416bd016e..e5cddbc3a28e0f90bd1d1ae6ebe28d5f2d0299c7 100644
index a2ef727d3a61985e84782e4517fb9d354aa203ef..255bcc602cfa453ab8cb0e0a9aa9a92a704b09c9 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -177,6 +177,7 @@ class RenderFrameHost;

4
patches/common/chromium/cross_site_document_resource_handler.patch
View File

@@ -22,7 +22,7 @@ index d514c10160dd12f225c42e927977660cacbc9c43..49345f1d4d75c8b96efe485202d89774
}
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index d15061de5254fd4f248fed92f47a1b1fcf34cd68..ac0151af07e440b7e4b7a291530abe108b5cd7d9 100644
index aff110b0e5b90ef10445f8fcabfba2d6acabc8d9..e51c018b95b0f2dff650a83b4af638ef431aaa11 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -57,6 +57,10 @@ std::unique_ptr<BrowserMainParts> ContentBrowserClient::CreateBrowserMainParts(
@@ -37,7 +37,7 @@ index d15061de5254fd4f248fed92f47a1b1fcf34cd68..ac0151af07e440b7e4b7a291530abe10
const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& task_runner,
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index e5cddbc3a28e0f90bd1d1ae6ebe28d5f2d0299c7..93fd647a472466633d608e05c0b66653c696073d 100644
index 255bcc602cfa453ab8cb0e0a9aa9a92a704b09c9..f8e52b835c556ccb9526f1df644eb367152af75e 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -219,6 +219,9 @@ class CONTENT_EXPORT ContentBrowserClient {

2
patches/common/chromium/disable-redraw-lock.patch
View File

@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
can be found at https://github.com/electron/electron/issues/1821
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index de88c769b5be6b7f568d999d8bb92792e0e0ae19..ba47d52fd467e01c3d36db48d3b546bfa8468ed5 100644
index abde4d03cb3bd90fbe693da2eb272a064a98e945..0f1cf879163eb9bb3d3fc52c41c32f254f0682b9 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -286,6 +286,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;

32
patches/common/chromium/disable_color_correct_rendering.patch
View File

@@ -65,7 +65,7 @@ index 78a6b5739caed8c3925f303c52ed107be8e4ccfe..ddbf660e594c1a991d4e758fa11b1b2e
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
#if defined(OS_WIN)
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b459800aa0f 100644
index 4a8ed779e11a44892af72f6b2dd49ce8be2dc63c..41fdfc31f0fb26e100bb3de20088781588f9674a 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -80,6 +80,9 @@
@@ -78,7 +78,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
namespace viz {
namespace {
@@ -554,8 +557,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
@@ -555,8 +558,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
SetBlendEnabled(quad->ShouldDrawWithBlending());
@@ -90,7 +90,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
// Use the full quad_rect for debug quads to not move the edges based on
// partial swaps.
@@ -1335,7 +1339,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
@@ -1368,7 +1372,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background,
params->use_color_matrix, tint_gl_composited_content_,
ShouldApplyRoundedCorner(params->quad)),
@@ -100,7 +100,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
}
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
@@ -1806,8 +1811,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
@@ -1839,8 +1844,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -111,7 +111,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
SetShaderColor(color, opacity);
if (current_program_->rounded_corner_rect_location() != -1) {
SetShaderRoundedCorner(
@@ -1962,8 +1967,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
@@ -1995,8 +2000,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
: NON_PREMULTIPLIED_ALPHA,
false, false, tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -122,7 +122,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2059,8 +2064,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
@@ -2092,8 +2097,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@@ -133,7 +133,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2163,7 +2168,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
@@ -2196,7 +2201,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
gfx::ColorSpace dst_color_space =
@@ -142,7 +142,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
// Force sRGB output on Windows for overlay candidate video quads to match
// DirectComposition behavior in case these switch between overlays and
// compositing. See https://crbug.com/811118 for details.
@@ -2319,8 +2324,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
@@ -2352,8 +2357,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
ShouldApplyRoundedCorner(quad)),
@@ -153,7 +153,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
@@ -2377,8 +2382,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
@@ -2410,8 +2415,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
// Bind the program to the GL state.
@@ -164,7 +164,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
if (current_program_->rounded_corner_rect_location() != -1) {
SetShaderRoundedCorner(
@@ -3071,7 +3076,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
@@ -3104,7 +3109,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
const gfx::ColorSpace& src_color_space,
const gfx::ColorSpace& dst_color_space) {
@@ -175,7 +175,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
ProgramKey program_key = program_key_no_color;
const gfx::ColorTransform* color_transform =
@@ -3425,7 +3432,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
@@ -3458,7 +3465,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
*overlay_texture = FindOrCreateOverlayTexture(
params.quad->render_pass_id, iosurface_width, iosurface_height,
@@ -184,7 +184,7 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
*new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size()));
@@ -3629,8 +3636,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
@@ -3662,8 +3669,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING);
@@ -196,14 +196,14 @@ index 3b93c6b3a41d0dd5174b2acb15fe4f3d1714e4d4..a8de22d3f29d5e290af1c5612e666b45
gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -3790,3 +3798,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
@@ -3823,3 +3831,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
}
} // namespace viz
+
+#undef PATCH_CS
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index f34cfb51693648a7b342d21a61c601090209355a..b488efc71edf5d79e16c25d3d7be2d8ea9fa2ec8 100644
index de3031466a5335e05ff07c725681b1ccacf204f7..17804b487da056dbb5868b56ac5fcf34b7cf19ff 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -191,6 +191,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -215,7 +215,7 @@ index f34cfb51693648a7b342d21a61c601090209355a..b488efc71edf5d79e16c25d3d7be2d8e
service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c09ee4ccb619327a8723b389b758d200bf49a45c..40d6675f3f7901fc76bbcc2a4854de0a6dcceeec 100644
index d4db797076a941990ef63f5b7cfe0b5c22157aae..35e81708e9b20c7b8934ff55747a80db02d989e6 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -218,6 +218,7 @@
@@ -226,7 +226,7 @@ index c09ee4ccb619327a8723b389b758d200bf49a45c..40d6675f3f7901fc76bbcc2a4854de0a
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
@@ -2913,6 +2914,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -2937,6 +2938,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

2
patches/common/chromium/disable_network_services_by_default.patch
View File

@@ -12,7 +12,7 @@ We should remove this patch after all Electron's code has been migrated to the
NetworkService.
diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
index 6d52910b8a248519a5eedad42d4f081840db92e7..89635931c4d45447f82156974a3145394098ef68 100644
index d51fd50a5dee0188362ffa0aa2762bd27964d529..0f590a2d6b359cfd289ac0df797058463564ab2c 100644
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -18,7 +18,7 @@ const base::Feature kNetworkErrorLogging{"NetworkErrorLogging",

2
patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
View File

@@ -6,7 +6,7 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
See https://github.com/electron/electron/issues/10754
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 8e56cae5da0a5973c14a218e9207edc56511f245..aa82630fa95515c30e5084ee757d6d3df52a094c 100644
index 7e782a249da6ae9085fd2eb73fa593dd3137043a..aea7cd8853e953adc815561f78aebaf0317fff1d 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3637,7 +3637,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,

10
patches/common/chromium/frame_host_manager.patch
View File

@@ -8,10 +8,10 @@ and respond with custom instance. Also allows for us to at-runtime
enable or disable this patch.
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index 12e1c5cff95aa6d0a907a249208e23371cf29785..e64703c0edac7f7e9af211b0130a776e6ce3f953 100644
index 88e2bfabe6ca749fd588b92131abddbbb7814202..d8aa8910a01df716944b7a224d7b07ee6885c6da 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -138,6 +138,13 @@ scoped_refptr<SiteInstanceImpl> BrowsingInstance::GetSiteInstanceForURLHelper(
@@ -143,6 +143,13 @@ scoped_refptr<SiteInstanceImpl> BrowsingInstance::GetSiteInstanceForURLHelper(
return nullptr;
}
@@ -152,7 +152,7 @@ index 297b61198dd46114b3d8c89488a71ed01aa299c4..40b848a8b448bed2d167bf5f6c0f2597
}
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index fd184108a7993094c29be3f7ebde658e259ede2c..75aa4a6b7d58a1bebe34efc923953c69348428a9 100644
index f7cffe3b5bce5fc87a0a4b2fd838d0c25849da66..a7ed785356c4e3a634777bad5e40f08120377e83 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -342,6 +342,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const GURL& url) {
@@ -179,7 +179,7 @@ index a46901055bdf17b6b0dab14edf753b234dc04a12..29c201b0c95eb0c7a35f47d6f3ab5b48
size_t GetRelatedActiveContentsCount() override;
bool RequiresDedicatedProcess() override;
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index ac0151af07e440b7e4b7a291530abe108b5cd7d9..f40a4ff5f08e906e62dd838eb5af63ade92037d2 100644
index e51c018b95b0f2dff650a83b4af638ef431aaa11..be9728a49ead7c2667a7fbe2e26b10ab6c694b6d 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -52,6 +52,20 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
@@ -204,7 +204,7 @@ index ac0151af07e440b7e4b7a291530abe108b5cd7d9..f40a4ff5f08e906e62dd838eb5af63ad
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 93fd647a472466633d608e05c0b66653c696073d..a179e37db44e67143d63af2746e43b8231b30b17 100644
index f8e52b835c556ccb9526f1df644eb367152af75e..1837b06d3d5cf1ce26f391222a4e06560b8363f1 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -211,8 +211,40 @@ CONTENT_EXPORT void OverrideOnBindInterface(

4
patches/common/chromium/mas_no_private_api.patch
View File

@@ -38,7 +38,7 @@ index 743d1364bcd13e24ecbe5ced730161d15b8c3e93..a7e81072194c00baa0aa3159a6bfe374
// is concerned.
@property(nonatomic, readonly) NSString* subrole;
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 237b07caa5ed7626c3b5b538cbb77f582f884203..cc4cb1ce9308ba8aecd6cc138954a1b5e04e6d29 100644
index 444bb384d8453c19f0eec31dc3411b8684f502ca..9d0fbb5d5faf900810b4f85cc8c9bb3a279af78c 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -141,6 +141,7 @@
@@ -181,7 +181,7 @@ index 237b07caa5ed7626c3b5b538cbb77f582f884203..cc4cb1ce9308ba8aecd6cc138954a1b5
return nil;
}
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index e02f5f922ea0eeca39fdf0acc265e1ef9dc254a6..764cac3182c3611e2c1fc4a0aa73b13ac81a9a72 100644
index 0c9de0ce2504dca9e9e628885b3dcfbfc37f9675..d6b4139c4bf486182883a45ba7ccc70d42681998 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -491,6 +491,7 @@ void PostAnnouncementNotification(NSString* announcement) {

8
patches/common/chromium/render_widget_host_view_mac.patch
View File

@@ -5,7 +5,7 @@ Subject: render_widget_host_view_mac.patch
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c417d31d206 100644
index f583a0a6eaacc63941c7bf281534d9d7baeb7f1e..46fcb918f42654ec1d7d2c5c5ea70e4a402dede1 100644
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -142,6 +142,11 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -30,7 +30,7 @@ index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c41
return [self acceptsMouseEventsWhenInactive];
}
@@ -792,6 +800,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
@@ -785,6 +793,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
eventType == NSKeyDown &&
!(modifierFlags & NSCommandKeyMask);
@@ -41,7 +41,7 @@ index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c41
// We only handle key down events and just simply forward other events.
if (eventType != NSKeyDown) {
clientHelper_->ForwardKeyboardEvent(event, latency_info);
@@ -1505,9 +1517,11 @@ - (NSAccessibilityRole)accessibilityRole {
@@ -1498,9 +1510,11 @@ - (NSAccessibilityRole)accessibilityRole {
// Since this implementation doesn't have to wait any IPC calls, this doesn't
// make any key-typing jank. --hbono 7/23/09
//
@@ -53,7 +53,7 @@ index 8284524948c54c91e80e61c046ef7a8a7e66ba66..5e0218a0933df9440bcb86ac89373c41
- (NSArray*)validAttributesForMarkedText {
// This code is just copied from WebKit except renaming variables.
@@ -1516,7 +1530,10 @@ - (NSArray*)validAttributesForMarkedText {
@@ -1509,7 +1523,10 @@ - (NSArray*)validAttributesForMarkedText {
initWithObjects:NSUnderlineStyleAttributeName,
NSUnderlineColorAttributeName,
NSMarkedClauseSegmentAttributeName,

6
patches/common/chromium/resource_file_conflict.patch
View File

@@ -52,10 +52,10 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 7b277dc44034b556594bf47736d3ea95e85d2ac2..3d642578ed329b970e23785c09106b4cfdd9445a 100644
index e06ba8ee8bcf4cc240029fc66a7c2681786217a0..fd7c321a8e72783b27c8fda390455712888b65f8 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1686,7 +1686,7 @@ if (is_chrome_branded && !is_android) {
@@ -1723,7 +1723,7 @@ if (is_chrome_branded && !is_android) {
}
}
@@ -64,7 +64,7 @@ index 7b277dc44034b556594bf47736d3ea95e85d2ac2..3d642578ed329b970e23785c09106b4c
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1710,6 +1710,12 @@ if (!is_android) {
@@ -1747,6 +1747,12 @@ if (!is_android) {
}
}

4
patches/common/chromium/support_mixed_sandbox_with_zygote.patch
View File

@@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 1aa874a2cf34f0cbd17e8a95e3c6ce41d809e590..c09ee4ccb619327a8723b389b758d200bf49a45c 100644
index 67ec1115d928eab0750b3aa792984f03ebdf3627..d4db797076a941990ef63f5b7cfe0b5c22157aae 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -418,6 +418,10 @@ class RendererSandboxedProcessLauncherDelegate
@@ -58,7 +58,7 @@ index 1aa874a2cf34f0cbd17e8a95e3c6ce41d809e590..c09ee4ccb619327a8723b389b758d200
};
const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
@@ -1730,11 +1742,18 @@ bool RenderProcessHostImpl::Init() {
@@ -1754,11 +1766,18 @@ bool RenderProcessHostImpl::Init() {
cmd_line->PrependWrapper(renderer_prefix);
AppendRendererCommandLine(cmd_line.get());

2
patches/common/chromium/unsandboxed_ppapi_processes_skip_zygote.patch
View File

@@ -5,7 +5,7 @@ Subject: unsandboxed ppapi processes skip zygote
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 37713154ca38166f5abf34f128211e84a9267553..2afb96a4c46d654630c5519b7654b42654a88b5f 100644
index 56a1b68a0d03f2a5ea7fc809e383a82579ef01a2..70d083de6b6db96c6a2ce8a412f59b824656b29e 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -121,6 +121,9 @@ class PpapiPluginSandboxedProcessLauncherDelegate

6
patches/common/chromium/web_contents.patch
View File

@@ -5,10 +5,10 @@ Subject: web_contents.patch
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 69c5bb6eaf68bfb81f86a3598091203cc98ea45f..893b8c059c986b0ec5b8602358a5eb0e8828333d 100644
index 5d4b92af30e335b996f7fb48dd0fd24c74a79026..91424108450ee591539c9548b1201c2541fa3160 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2070,6 +2070,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2071,6 +2071,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -21,7 +21,7 @@ index 69c5bb6eaf68bfb81f86a3598091203cc98ea45f..893b8c059c986b0ec5b8602358a5eb0e
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2085,6 +2091,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2086,6 +2092,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
&render_view_host_delegate_view_);
}
}

2
patches/common/v8/add_realloc.patch
View File

@@ -30,7 +30,7 @@ index c54b088404229dccf015e20b6a5bab19d3d94e69..cc603dc4aae69de4b09f06ed0bca48cd
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api/api.cc b/src/api/api.cc
index 74fc41ae4935044bc23c11a511abd5342d8f8e5d..a4e275c19097a9083606707d969791194e9b23d0 100644
index 399aca7eb61dff4c67ad1fbe0620af3a3bf94254..3adeb5a0adbbbb3c61036ef0b95c4860e6586d0b 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -515,6 +515,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

6
patches/common/v8/build_gn.patch
View File

@@ -5,7 +5,7 @@ Subject: build_gn.patch
diff --git a/BUILD.gn b/BUILD.gn
index 87cad0479dc00fb53e192e46f5d99cd8788c8119..45e91038e271c557474bb52493076e04542d0dd8 100644
index 8640517ae5c23d3ca162bde999f76c25dfab5a00..c4f58e25a7330806754ecf678e0629cae3394d80 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -269,7 +269,7 @@ config("internal_config") {
@@ -17,7 +17,7 @@ index 87cad0479dc00fb53e192e46f5d99cd8788c8119..45e91038e271c557474bb52493076e04
defines += [ "BUILDING_V8_SHARED" ]
}
}
@@ -3787,7 +3787,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -3790,7 +3790,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@@ -26,7 +26,7 @@ index 87cad0479dc00fb53e192e46f5d99cd8788c8119..45e91038e271c557474bb52493076e04
deps = [
":v8_libbase",
@@ -3818,6 +3818,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
@@ -3821,6 +3821,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]

4
patches/common/v8/dcheck.patch
View File

@@ -5,10 +5,10 @@ Subject: dcheck.patch
diff --git a/src/api/api.cc b/src/api/api.cc
index a0e2766c60eee5e2bd1d7b651b1e16f656f79cdd..53f4449081e5ba082af72d7ab2db37e3eebdba46 100644
index 70c1acadf41f67cbf81cc33b561d428c7ef7cfe4..6117189ad11a189e03c4db1307d919b818751b18 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -8236,7 +8236,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -8245,7 +8245,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::RunMicrotasks() {

6
patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch
View File

@@ -174,7 +174,7 @@ index cc603dc4aae69de4b09f06ed0bca48cdae8eebd3..c59b0fa69880c237e3b60f190160d8b9
#ifdef V8_ENABLE_CHECKS
CheckCast(value);
diff --git a/src/api/api.cc b/src/api/api.cc
index a4e275c19097a9083606707d969791194e9b23d0..a0e2766c60eee5e2bd1d7b651b1e16f656f79cdd 100644
index 3adeb5a0adbbbb3c61036ef0b95c4860e6586d0b..70c1acadf41f67cbf81cc33b561d428c7ef7cfe4 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -2171,6 +2171,10 @@ int PrimitiveArray::Length() const {
@@ -324,7 +324,7 @@ index a4e275c19097a9083606707d969791194e9b23d0..a0e2766c60eee5e2bd1d7b651b1e16f6
Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate,
Local<String> value) {
i::Handle<i::String> string = Utils::OpenHandle(*value);
@@ -8589,6 +8666,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
@@ -8598,6 +8675,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8_isolate) {
return microtask_queue->IsRunningMicrotasks();
}
@@ -334,7 +334,7 @@ index a4e275c19097a9083606707d969791194e9b23d0..a0e2766c60eee5e2bd1d7b651b1e16f6
String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
: str_(nullptr), length_(0) {
if (obj.IsEmpty()) return;
@@ -8606,6 +8686,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
@@ -8615,6 +8695,9 @@ String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
String::Utf8Value::~Utf8Value() { i::DeleteArray(str_); }

2
patches/common/v8/do_not_export_private_v8_symbols_on_windows.patch
View File

@@ -12,7 +12,7 @@ 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`).
diff --git a/BUILD.gn b/BUILD.gn
index 1acc7006545bd4ff6112b444758bde4c16d0c3e5..748d700cead149f5cdeebcfe11d07516db3d6a86 100644
index b399acc1739dcdf3623bc5bbfd273d1a3f202981..071a85c3f57ae92dcf90d47a13299e43f81753ec 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -269,6 +269,10 @@ config("internal_config") {

4
patches/common/v8/expose_mksnapshot.patch
View File

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 45e91038e271c557474bb52493076e04542d0dd8..1acc7006545bd4ff6112b444758bde4c16d0c3e5 100644
index c4f58e25a7330806754ecf678e0629cae3394d80..b399acc1739dcdf3623bc5bbfd273d1a3f202981 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3798,8 +3798,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -3801,8 +3801,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

6
script/zip_manifests/dist_zip.mac.x64.manifest
View File

@@ -137,6 +137,12 @@ Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/MacOS/
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/MacOS/Electron Helper
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/PkgInfo
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/Info.plist
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/MacOS/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/MacOS/Electron Helper (GPU)
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/PkgInfo
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/Contents/
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/Contents/Info.plist

6
script/zip_manifests/dist_zip.mac_mas.x64.manifest
View File

@@ -136,6 +136,12 @@ Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/MacOS/
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/MacOS/Electron Helper
Electron.app/Contents/Frameworks/Electron Helper.app/Contents/PkgInfo
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/Info.plist
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/MacOS/
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/MacOS/Electron Helper (GPU)
Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/PkgInfo
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/Contents/
Electron.app/Contents/Frameworks/Electron Helper (Plugin).app/Contents/Info.plist