mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: bump chromium to c75fbfd03652 (master) (#18090)

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/1532361
This commit is contained in:
Electron Bot 2019-05-01 16:42:49 -04:00 • committed by Jeremy Apthorp
parent dd3913fada
commit 61effac72a
16 changed files with 34 additions and 29 deletions
Show stats 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':
'7dff37844cb359ec96a63c4526574ec71138c2ec',
'c75fbfd03652ef484e5f79baa285bacfcd760dcd',
'node_version':
'696d8fb66d6f65fc82869d390e0d2078970b1eb4',

4
atom/browser/browser_process_impl.cc
View file

@ -338,3 +338,7 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
return nullptr;
#endif
}
StartupData* BrowserProcessImpl::startup_data() {
return nullptr;
}

1
atom/browser/browser_process_impl.h
View file

@ -114,6 +114,7 @@ class BrowserProcessImpl : public BrowserProcess {
void SetApplicationLocale(const std::string& locale) override;
const std::string& GetApplicationLocale() override;
printing::PrintJobManager* print_job_manager() override;
StartupData* startup_data() override;
private:
#if BUILDFLAG(ENABLE_PRINTING)

6
patches/common/chromium/blink_local_frame.patch
View file

@ -14,10 +14,10 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron.
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index f5e5cfbd9f07c3c7140e43d1fd6804762aa6fe49..0c300bf86535de1091c757565e12b6e6e5168a77 100644
index 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63918850bb 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -413,10 +413,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -423,10 +423,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
}
CHECK(!view_ || !view_->IsAttached());
@ -28,7 +28,7 @@ index f5e5cfbd9f07c3c7140e43d1fd6804762aa6fe49..0c300bf86535de1091c757565e12b6e6
if (!Client())
return;
@@ -434,6 +430,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -444,6 +440,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
// Notify ScriptController that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy.
GetScriptController().ClearForClose();

4
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 6a42afb61eadb92a18c7506254aa015b2e7092e3..ed3f60d9230ae7ca902ba28caf8193ad895fe497 100644
index 5eb0746e4d69a72b083d1632bb66882888b6b7f1..e99ea17700d6e0c240e07984748983e65fc61425 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3669,6 +3669,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@ -17,7 +17,7 @@ index 6a42afb61eadb92a18c7506254aa015b2e7092e3..ed3f60d9230ae7ca902ba28caf8193ad
&no_javascript_access);
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 88471bc49cd5b00a9494cc3998ba9c44c2c87088..b78d5facf5fad5385d205f5cdc40f3609efa3741 100644
index 68cb13c4e2bd144a81546edb99ba993e36cf09ff..67b676e6c58f2e27e47c9064980e2bfca39c7d3b 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -289,6 +289,10 @@ struct CreateNewWindowParams {

4
patches/common/chromium/content_allow_embedder_to_prevent_locking_scheme_registry.patch
View file

@ -12,7 +12,7 @@ Without this patch, calling `registerStandardSchemes` during initialization
when in debug mode will cause a DCHECK to fire.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 732dc46b8bab153bb16228745a0161e42a9c1dd8..a9e907487f5d0dd502b593a147f816c1a0db9206 100644
index 3dda0677bfc7ff8bb0e2728ab40f586c450a4a20..1d094c0ebbfe4ee5a75c58ce7f823bdb0a1124f7 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -758,7 +758,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@ -40,7 +40,7 @@ index 456df421598153bde006ad0ecb0f1031360bb543..af06d78b91fa30e5daf993ad2c65c2c5
return service_manager::ProcessType::kDefault;
}
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
index f498906f693ea6047add85fcf59ed34457120053..9864dbdd240b3c55eec53a1ab46e409c3d463293 100644
index 01f81ee8a103bc893c0739de3463c48839f8d10f..40123b4bf42131a716f9ed7f5dd14b93151fd0b3 100644
--- a/content/public/app/content_main_delegate.h
+++ b/content/public/app/content_main_delegate.h
@@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentMainDelegate {

4
patches/common/chromium/content_browser_main_loop.patch
View file

@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents.
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 76a2d13bc732916c304aecb493aba548e935e052..be90711e6e2ea740d41c8da41234b3db1fd5aea7 100644
index 6a1d8bbebc69b031ac02b56756a8f313bd1b030f..ca61686d763cd7fb867599397a161e8c88c5b7a9 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1574,7 +1574,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
@@ -1570,7 +1570,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
}
base::RunLoop run_loop;

2
patches/common/chromium/disable_color_correct_rendering.patch
View file

@ -215,7 +215,7 @@ index 53fc82c1f2cc0cfb7a6ce909fea6c025dff26b43..ec00a673df6a8f1c372fc8dff7cf5085
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 c44c20c07828242eb3b7000252636d30a6fab2e1..c520a44f451c0274ed6af832eadb0129876df409 100644
index 50f63a2c8f8ec447545d2b2c80afef34ad4a7fef..8728e19fe5087927b4d6aa8cccaf09258aae9ea4 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -220,6 +220,7 @@

4
patches/common/chromium/disable_detach_webview_frame.patch
View file

@ -12,10 +12,10 @@ this patch was introduced in Chrome 66.
Update(zcbenz): The bug is still in Chrome 72.
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index f93a9b7747c6501df48ffa6be286cdba3f0344d5..bff8ed632f878f74caab9b4184127f480877305c 100644
index 62436cdd04e7b7c83e04cd6339ccf8374c78e34a..1f006c181eee5d6cea95894fea1204ca75af0bee 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -268,6 +268,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
@@ -269,6 +269,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
void RenderFrameProxyHost::OnDetach() {
if (frame_tree_node_->render_manager()->IsMainFrameForInnerDelegate()) {

4
patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
View file

@ -6,10 +6,10 @@ 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 c3e77bc86d0b77fec2a0db459aefd749c6f04934..167235e72d20e1beb65abdf3b3c64a02f76796c9 100644
index 30f6773e4d37c5e4523bb14a925df5685957b107..e2f9cada0171c5b85445d1d6a105250dd36f17a0 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3568,7 +3568,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
@@ -3596,7 +3596,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
"frame that never had a user gesture since its load. "
"https://www.chromestatus.com/feature/5082396709879808";
Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);

2
patches/common/chromium/gritsettings_resource_ids.patch
View file

@ -6,7 +6,7 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 5c8eb8c98ce8150446bf32451dbd523af2f00fb6..a960b01a46da8b58616fddc33f04da167640ba0e 100644
index a1610f3c9b4bed651270eee9a44a7f6fa57b1059..65c06739b2ba014c603c59a2bee80a43ced2c3df 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -438,6 +438,11 @@

4
patches/common/chromium/notification_provenance.patch
View file

@ -109,10 +109,10 @@ index de7f9d4c1b670b6955ec62e562b133a86b770652..a7daada96b6ebed404d6fa3eef1048ab
// Removes |service| from the list of owned services, for example because the
diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
index 1bd1a3f7a152fe63f956cf8eca353d24fb86d5a7..904dea361831e4d57c0f6b65e4690f7948f3fab2 100644
index d689e264d2b547c155c6e722bd6f6b81cefde3a2..1faf3d47b0207108183c1529928926e762143122 100644
--- a/content/browser/renderer_interface_binders.cc
+++ b/content/browser/renderer_interface_binders.cc
@@ -189,7 +189,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
@@ -196,7 +196,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
RenderProcessHost* host, const url::Origin& origin) {
static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
->GetPlatformNotificationContext()

2
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/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
index 03ee233d5e07fd59f07227d5f925590a08935049..c9ca2bd46987a56901fb0d15969e1b29b69f42ce 100644
index 5f6728312a5676285eebcb120a59b2e76a11d8bc..b7a1a16c1b282f7739638d8375117192da77b5e7 100644
--- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm
+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
@@ -142,6 +142,11 @@ void ExtractUnderlines(NSAttributedString* string,

2
patches/common/chromium/resource_file_conflict.patch
View file

@ -52,7 +52,7 @@ 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 645bf391f2e7ffa9974c4cdfb0e323dc14cbf931..def59a7885004ee42b331f3af3241f4e6947b0c1 100644
index b51701cb23a746fa8c85dd308db40599ebb513c4..d40202886f0bafce384a13306de531845758eb1c 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1646,7 +1646,7 @@ if (is_chrome_branded && !is_android) {

2
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 abb4caa2a04c50d11165005768891f416aa684d3..c44c20c07828242eb3b7000252636d30a6fab2e1 100644
index dd8bdad9432ef754b5f3bbfd97d94af9092714ae..50f63a2c8f8ec447545d2b2c80afef34ad4a7fef 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -420,6 +420,10 @@ class RendererSandboxedProcessLauncherDelegate

16
patches/common/chromium/viz_osr.patch
View file

@ -97,11 +97,11 @@ index 93c52d2b928cba6e98723e19b005fb7bd7089a58..4dc645e770a2a039ed8e4ff4de555767
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index b87dda651d12d8b6bd1c58bc323ec06667418794..58aaf1bb6692d7365fbd4fe2f4d6daa86886e126 100644
index 21345740188ebc13aefae524c9fe065168ccaf27..f56d94f8810063d36ee161b87dccfecbe6e3ab85 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -116,6 +116,8 @@ viz_component("service") {
"display_embedder/in_process_gpu_memory_buffer_manager.h",
"display_embedder/output_surface_provider_impl.h",
"display_embedder/server_shared_bitmap_manager.cc",
"display_embedder/server_shared_bitmap_manager.h",
+ "display_embedder/software_output_device_proxy.cc",
@ -109,11 +109,11 @@ index b87dda651d12d8b6bd1c58bc323ec06667418794..58aaf1bb6692d7365fbd4fe2f4d6daa8
"display_embedder/software_output_surface.cc",
"display_embedder/software_output_surface.h",
"display_embedder/viz_process_context_provider.cc",
diff --git a/components/viz/service/display_embedder/gpu_display_provider.cc b/components/viz/service/display_embedder/gpu_display_provider.cc
index e57ba4becd8453d8fc452df7b571d4a0794c4b74..b8ef7e9410f172ff09b90087655ea85f89a748eb 100644
--- a/components/viz/service/display_embedder/gpu_display_provider.cc
+++ b/components/viz/service/display_embedder/gpu_display_provider.cc
@@ -19,6 +19,7 @@
diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
index 264c56995171182940b223da06b809eebf78e918..cafc117436bdfb5600e5dfbcd2edf21fe505eeea 100644
--- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -18,6 +18,7 @@
#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
#include "components/viz/service/display_embedder/skia_output_surface_impl.h"
#include "components/viz/service/display_embedder/skia_output_surface_impl_non_ddl.h"
@ -121,7 +121,7 @@ index e57ba4becd8453d8fc452df7b571d4a0794c4b74..b8ef7e9410f172ff09b90087655ea85f
#include "components/viz/service/display_embedder/software_output_surface.h"
#include "components/viz/service/display_embedder/viz_process_context_provider.h"
#include "components/viz/service/gl/gpu_service_impl.h"
@@ -277,6 +278,19 @@ GpuDisplayProvider::CreateSoftwareOutputDeviceForPlatform(
@@ -240,6 +241,19 @@ OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
if (headless_)
return std::make_unique<SoftwareOutputDevice>();