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

update patches

Browse Source
This commit is contained in:
Electron Bot
2021-04-01 13:18:48 +00:00
committed by Samuel Attard
parent 668b82be80
commit 4444596af5
17 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/chromium/allow_in_process_windows_to_have_different_web_prefs.patch
View File

@@ -8,11 +8,11 @@ WebPreferences of in-process child windows, rather than relying on
process-level command line switches, as before.
diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
index 815ec3ea2993599680cd4143596f27bf44c6149e..df6afe805f2cf05272a49dd0b51277b8c9bc90a6 100644
index 1363ee73abdfb05f7ff422c75b975a9d74f7dd43..b41efe03d5ba59a26a0bfe321fe36db80294b2ca 100644
--- a/third_party/blink/common/web_preferences/web_preferences.cc
+++ b/third_party/blink/common/web_preferences/web_preferences.cc
@@ -147,6 +147,28 @@ WebPreferences::WebPreferences()
navigate_on_drag_drop(true),
@@ -148,6 +148,28 @@ WebPreferences::WebPreferences()
fake_no_alloc_direct_call_for_testing_enabled(false),
v8_cache_options(blink::mojom::V8CacheOptions::kDefault),
record_whole_document(false),
+
@@ -40,7 +40,7 @@ index 815ec3ea2993599680cd4143596f27bf44c6149e..df6afe805f2cf05272a49dd0b51277b8
accelerated_video_decode_enabled(false),
animation_policy(
diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
index ba1ba323ec45296c33b5931652a001d6bd24dbe0..7d644150a1733bd0bca1c6bb63c759641ba091e8 100644
index 7fa49dd367b28441c1395b11dfe8795dc230b7e3..0a6821e4264f4f21862a6e0f1bb129ff690f8cc3 100644
--- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
+++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -24,6 +24,11 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -55,8 +55,8 @@ index ba1ba323ec45296c33b5931652a001d6bd24dbe0..7d644150a1733bd0bca1c6bb63c75964
!data.ReadLazyFrameLoadingDistanceThresholdsPx(
&out->lazy_frame_loading_distance_thresholds_px) ||
!data.ReadLazyImageLoadingDistanceThresholdsPx(
@@ -152,6 +157,25 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
out->navigate_on_drag_drop = data.navigate_on_drag_drop();
@@ -154,6 +159,26 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
data.fake_no_alloc_direct_call_for_testing_enabled();
out->v8_cache_options = data.v8_cache_options();
out->record_whole_document = data.record_whole_document();
+
@@ -82,7 +82,7 @@ index ba1ba323ec45296c33b5931652a001d6bd24dbe0..7d644150a1733bd0bca1c6bb63c75964
out->accelerated_video_decode_enabled =
data.accelerated_video_decode_enabled();
diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
index 74ed4b91cdd4c0cc0244491dfbbdf8e69e54e6f5..de7c24ff8c780b05f7af613f6303705ec6cb2bf6 100644
index c457698eba5dcc2dad1b0e674cb6785ffc666b5b..3bef6f641619c79f75292c6f38e054b0507341d9 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -9,6 +9,7 @@
@@ -93,7 +93,7 @@ index 74ed4b91cdd4c0cc0244491dfbbdf8e69e54e6f5..de7c24ff8c780b05f7af613f6303705e
#include "base/time/time.h"
#include "build/build_config.h"
#include "net/nqe/effective_connection_type.h"
@@ -160,6 +161,27 @@ struct BLINK_COMMON_EXPORT WebPreferences {
@@ -161,6 +162,28 @@ struct BLINK_COMMON_EXPORT WebPreferences {
blink::mojom::V8CacheOptions v8_cache_options;
bool record_whole_document;
@@ -122,7 +122,7 @@ index 74ed4b91cdd4c0cc0244491dfbbdf8e69e54e6f5..de7c24ff8c780b05f7af613f6303705e
// only controls whether or not the "document.cookie" field is properly
// connected to the backing store, for instance if you wanted to be able to
diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
index ae180b30284c17c7319925531440161f66b873c7..18c55d24e40e2fee59ac3b4111d0c5ebb2661cad 100644
index e35980e72f5d74a2483f7c62acd1d4b5db7fc5ac..8e1530e2198b62e9b36c45a2aef3850938a9c400 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -6,6 +6,7 @@
@@ -133,7 +133,7 @@ index ae180b30284c17c7319925531440161f66b873c7..18c55d24e40e2fee59ac3b4111d0c5eb
#include "mojo/public/cpp/bindings/struct_traits.h"
#include "net/nqe/effective_connection_type.h"
#include "third_party/blink/public/common/common_export.h"
@@ -441,6 +442,80 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
@@ -446,6 +447,84 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
return r.record_whole_document;
}
@@ -215,7 +215,7 @@ index ae180b30284c17c7319925531440161f66b873c7..18c55d24e40e2fee59ac3b4111d0c5eb
return r.cookie_enabled;
}
diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
index 5428fa6e79ed60774fcd6e87dcd6a602143158b7..7decbc41450c7e8b4536eb8c3c087676a38f912c 100644
index 3e2aae1d92b1c60b725bc8386e1d304dfabe384c..be62241fef5f24935d1f47f4f8590bad8d26da8c 100644
--- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
+++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
@@ -226,7 +226,7 @@ index 5428fa6e79ed60774fcd6e87dcd6a602143158b7..7decbc41450c7e8b4536eb8c3c087676
enum PointerType {
kPointerNone = 1, // 1 << 0
@@ -211,6 +212,27 @@ struct WebPreferences {
@@ -212,6 +213,28 @@ struct WebPreferences {
V8CacheOptions v8_cache_options;
bool record_whole_document;

20
patches/chromium/can_create_window.patch
View File

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index ffcf8c6c749f933cbf15f2c34801d1d8207fc9ca..2dc386167f53cfac925dfb7f6719a27c6fa94821 100644
index 929f3b3450ff6eda94d8bb36a0f3632c57c49ae0..f30e63504304d94a7af7155a09780881de1f4c7f 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5351,6 +5351,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5368,6 +5368,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index ffcf8c6c749f933cbf15f2c34801d1d8207fc9ca..2dc386167f53cfac925dfb7f6719a27c
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3d08c2e95e3694f58c4ea0eec839f0f3debbb1cb..1175f2a74089990b1929f38a706fd46b491ccc7e 100644
index 0321d0f6d9bc399887fffab4b8a46a40a9017289..24979412cf08fdec93d256bcf16d7dd1abdf4ff6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3593,6 +3593,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3596,6 +3596,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
}
auto* new_contents_impl = new_contents.get();
@@ -39,7 +39,7 @@ index 3d08c2e95e3694f58c4ea0eec839f0f3debbb1cb..1175f2a74089990b1929f38a706fd46b
new_contents_impl->GetController().SetSessionStorageNamespace(
partition_id, session_storage_namespace);
@@ -3635,12 +3643,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3638,12 +3646,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@@ -68,10 +68,10 @@ index fb71337543f3c967a50e8e6031c8f2f2a997ebe2..54c53188a78d1011dc6a6758f0c515c2
// 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 bb56b322b0817302d8526790c2893927dcfba76e..db80cb9d15af7f59a312d1030aee6682b3ef86c1 100644
index af88b54f9208cb067d83f04f379b0911b15403f0..59c747a6f63a53eff7e2ca8d46a859f615638e3f 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -554,6 +554,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -559,6 +559,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -81,10 +81,10 @@ index bb56b322b0817302d8526790c2893927dcfba76e..db80cb9d15af7f59a312d1030aee6682
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 38d5ec2a45ad10dae17000a696ff913224fe78e9..31214ab14f3643d8f6ab38673195322c5e33f757 100644
index 89ae0bdd201df11f92318cce98e8d8254e183903..584a98da0ccde8b87171c6b6343b484b48f2e289 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -159,6 +159,7 @@ class NetworkService;
@@ -160,6 +160,7 @@ class NetworkService;
class TrustedURLLoaderHeaderClient;
} // namespace mojom
struct ResourceRequest;
@@ -92,7 +92,7 @@ index 38d5ec2a45ad10dae17000a696ff913224fe78e9..31214ab14f3643d8f6ab38673195322c
} // namespace network
namespace sandbox {
@@ -912,6 +913,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -914,6 +915,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,

12
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
View File

@@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
void AddNewContents(content::WebContents* source,
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
index 5aa4123de68da549f665970168f431a3a994d42f..468562a2060fee9c57f864da1b3e9f92a544c8b2 100644
index a0e7bcfa3f31ffe4142d80708df255cb6bcb8629..3411741da5d4a703f9b8b98dca817a2646d4c3df 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3545,8 +3545,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3548,8 +3548,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
@@ -334,10 +334,10 @@ index 9b293d0df6c634bf44a69d607c4eee839a74b4a1..7e5b9cbdcc232c5e20eae0130d800f50
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index f3b8095088310c0811d33904bc400a4ff8c60323..c5398f93dedef93b71e64af3a2d9f2c011245b8d 100644
index e2b5240255bfdd77ed7513b26ec404f2ec244151..8e45bb4e1817e5bce6465f895026bbf953920339 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -379,8 +379,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
@@ -380,8 +380,7 @@ bool MimeHandlerViewGuest::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@@ -348,10 +348,10 @@ index f3b8095088310c0811d33904bc400a4ff8c60323..c5398f93dedef93b71e64af3a2d9f2c0
}
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 17f911eef902bd5f30c852c1f517f4c1dd22c5b0..be333612ef35a8f43e66f3ca181bd573dd40791b 100644
index 7d27e12c4e9a7f32af8a26f672359057a643dd67..7a30ac31f79871f2a9afa0345e0e88affe7fe72f 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -157,8 +157,7 @@ class MimeHandlerViewGuest
@@ -158,8 +158,7 @@ class MimeHandlerViewGuest
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
View File

@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 2952cdf783aa8868a18136b1cfa82c2b08ba3adb..e408642168343b42579bfdbbd913520c53527d29 100644
index badc090fd9562fb198d2d31307e42b623a8bd119..7947263228a7143444e90e17cfc608bb53babe41 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6282,6 +6282,7 @@ static_library("browser") {
@@ -6280,6 +6280,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

6
patches/chromium/dcheck.patch
View File

@@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
failing checks and allow the rest of the target to have them enabled.
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index d07fca5f70059f88d5eab17feaa785aed6cca6f6..6dd86913d8647297b1fdaa369e1c383073654f07 100644
index 842764be673c200dad214e4abc30263fae65239a..98ae95c5e5eeca7baa48e1b6085b9cc60444a522 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -1341,8 +1341,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -1400,8 +1400,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
return NAVIGATION_TYPE_NEW_SUBFRAME;
}
@@ -33,7 +33,7 @@ index d07fca5f70059f88d5eab17feaa785aed6cca6f6..6dd86913d8647297b1fdaa369e1c3830
if (rfh->GetParent()) {
// All manual subframes would be did_create_new_entry and handled above, so
@@ -1653,7 +1655,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
@@ -1712,7 +1714,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
}
}

4
patches/chromium/delay_lock_the_protocol_scheme_registry.patch
View File

@@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
re-submitting the patch.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index db93a05c099e10008a4ededb879121dd0117e36e..e64fd4dcfbb7a07487327bb2a870705b041a192c 100644
index 2a45598e25f94d5bea73a7e5411dadf7ef0b2433..06fdc05a1839605ad2f1ca284d0c489d3023b643 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -722,7 +722,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -738,7 +738,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
}
#endif

4
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -20,10 +20,10 @@ to deal with color spaces. That is being tracked at
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
index edf67be0faa5af403f33af99e273d50f6d5d0a3f..18e48ce625f258f60044a87e95ce3c3f1982bf0b 100644
index 1e0da94e14e6180a4971e6e028306a1ae32308df..d180bfd510d348cc6c330fcc125c5aff33d7acb0 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1788,6 +1788,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@@ -1789,6 +1789,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace(
gfx::ContentColorUsage content_color_usage) const {

14
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
View File

@@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
We can remove this patch once it has in some shape been upstreamed.
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
index ce8d2422e63de7c5e48cc7b4c97d8fe9b5c4cabf..40b75f0cadc373f209247d5663d76d3a557bc965 100644
index 99fd81acb2535470dd148c283bba91cb5e778f6e..45957a0b3519675358fce1082574e7ac4fba43d1 100644
--- a/ui/native_theme/native_theme.cc
+++ b/ui/native_theme/native_theme.cc
@@ -319,6 +319,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
@@ -323,6 +323,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
}
bool NativeTheme::ShouldUseDarkColors() const {
@@ -26,10 +26,10 @@ index ce8d2422e63de7c5e48cc7b4c97d8fe9b5c4cabf..40b75f0cadc373f209247d5663d76d3a
}
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
index 0196aa21e880a517461001e7bbb1f3399bbc3b37..9375f55b6ab4a897d4e837e681eedf0145af9302 100644
index ac5cc40afbba43951600b384b8b6031b80895117..c524a1d089324cf86c8d380c2148ec9377fe0dcf 100644
--- a/ui/native_theme/native_theme.h
+++ b/ui/native_theme/native_theme.h
@@ -402,6 +402,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
@@ -403,6 +403,22 @@ class NATIVE_THEME_EXPORT NativeTheme {
SkColor GetUnprocessedSystemColor(ColorId color_id,
ColorScheme color_scheme) const;
@@ -52,14 +52,14 @@ index 0196aa21e880a517461001e7bbb1f3399bbc3b37..9375f55b6ab4a897d4e837e681eedf01
// 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).
// The returned object should not be deleted by the caller. This function is
@@ -568,6 +584,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
@@ -569,6 +585,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
bool forced_colors_ = false;
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
+ ThemeSource theme_source_ = ThemeSource::kSystem;
DISALLOW_COPY_AND_ASSIGN(NativeTheme);
};
SEQUENCE_CHECKER(sequence_checker_);
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 9ef5d287bb612e8f93f87eb569a6226847e72bc2..1522201d184cf114379da22253ca25240cd78959 100644
--- a/ui/native_theme/native_theme_win.cc

6
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -85,10 +85,10 @@ index 209067240ccce0458882ad008363cdb996dd1a80..eaacca18d1488b3a2f7445bb44949ccb
// 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
index 00972adc2234e906171039b19e299e3fa18cc212..8f2b579098a1e56a4f97fdcd9746d9b92f53a72a 100644
index 79ace5f2d480ab9951ff04c9b7deba46d4ce1050..eb740d3685c2226f5af55dca1224bd5348ea0d0e 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3551,6 +3551,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3554,6 +3554,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}
@@ -102,7 +102,7 @@ index 00972adc2234e906171039b19e299e3fa18cc212..8f2b579098a1e56a4f97fdcd9746d9b9
void WebViewImpl::SetVisibilityState(
mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) {
@@ -3563,7 +3570,8 @@ void WebViewImpl::SetVisibilityState(
@@ -3566,7 +3573,8 @@ void WebViewImpl::SetVisibilityState(
}
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
GetPage()->GetPageScheduler()->SetPageVisible(

4
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
to true as then Chromiums assumptions around processes become correct.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9ea418512971b355d27efa31a9803f1fade0b311..ff6e39c87d9a44ba63801749567a11b3e2c06597 100644
index dde26e94cb89fa64f68f42d6749890fab1b8e305..31131896492031d2a19ee93018d309309649320b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3012,11 +3012,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -3015,11 +3015,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
WebContentsImpl* outermost = GetOutermostWebContents();
if (event.button == blink::WebPointerProperties::Button::kBack &&
outermost->GetController().CanGoBack()) {

30
patches/chromium/frame_host_manager.patch
View File

@@ -42,10 +42,10 @@ index 65e627f2fa89352b0be27b5813d71a622bf1d326..113f4fd00f1cf994b39f64c9da387855
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index ae3ad72df799b7302cda2ff69649cc13105f0c87..2b7bdb2c45aea713e16fcf6a0a318c93b2d0d399 100644
index 53a7295d80eb9cf598c5246542f762fc721ce970..98d15d54b7cdd6de1f72458921c65cc186e883a0 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -1566,6 +1566,21 @@ void NavigationRequest::BeginNavigation() {
@@ -1558,6 +1558,21 @@ void NavigationRequest::BeginNavigation() {
if (IsSameDocument()) {
render_frame_host_ = frame_tree_node_->current_frame_host();
} else {
@@ -67,7 +67,7 @@ index ae3ad72df799b7302cda2ff69649cc13105f0c87..2b7bdb2c45aea713e16fcf6a0a318c93
// Select an appropriate RenderFrameHost.
std::string frame_host_choice_reason;
render_frame_host_ =
@@ -6113,6 +6128,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6099,6 +6114,7 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
{WILL_START_REQUEST, {
WILL_REDIRECT_REQUEST,
WILL_PROCESS_RESPONSE,
@@ -75,7 +75,7 @@ index ae3ad72df799b7302cda2ff69649cc13105f0c87..2b7bdb2c45aea713e16fcf6a0a318c93
READY_TO_COMMIT,
DID_COMMIT,
CANCELING,
@@ -6126,10 +6142,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
@@ -6112,10 +6128,14 @@ void NavigationRequest::CheckStateTransition(NavigationState state) const {
WILL_FAIL_REQUEST,
}},
{WILL_PROCESS_RESPONSE, {
@@ -106,10 +106,10 @@ index 194a284c068f60f9b3078110a6331eda7c5912b6..a53eb07d1c4bb0a47bdde4ca28b213a8
READY_TO_COMMIT,
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index ea4aa73aa4943b5bc9a8cc5f16e0a40fa671afe6..d71447dd6d176467e8169276c823043e8f0745f3 100644
index af497e6916d72bfbd40fe9f131be6022482ef810..74f9fe3a0a0de20d48bc8b2d397109381ea66481 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -2850,6 +2850,16 @@ scoped_refptr<SiteInstance>
@@ -2859,6 +2859,16 @@ scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request,
std::string* reason) {
@@ -126,7 +126,7 @@ index ea4aa73aa4943b5bc9a8cc5f16e0a40fa671afe6..d71447dd6d176467e8169276c823043e
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2877,10 +2887,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2886,10 +2896,59 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@@ -190,7 +190,7 @@ index ea4aa73aa4943b5bc9a8cc5f16e0a40fa671afe6..d71447dd6d176467e8169276c823043e
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2913,6 +2972,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2922,6 +2981,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@@ -201,10 +201,10 @@ index ea4aa73aa4943b5bc9a8cc5f16e0a40fa671afe6..d71447dd6d176467e8169276c823043e
}
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 49aa529d098b6ad59ba81351241695343c3406ed..b8f528aac7bc56127d8ae14010d39b71b2345e4c 100644
index fded3931c51e28c11c43c4994442a13e4d8fe334..06de277c81f26b82ff5c6bf660dc98a3ede608bd 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -1127,6 +1127,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
@@ -1131,6 +1131,10 @@ bool SiteInstanceImpl::HasRelatedSiteInstance(const SiteInfo& site_info) {
return browsing_instance_->HasSiteInstance(site_info);
}
@@ -216,10 +216,10 @@ index 49aa529d098b6ad59ba81351241695343c3406ed..b8f528aac7bc56127d8ae14010d39b71
const GURL& url) {
return GetRelatedSiteInstanceImpl(
diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
index 350ca11e74fdb46e29288f5fb378d134c2f04c38..deb899ad6865beffaf85eac53b1b7cef5ccc7c82 100644
index 6505a8f6e514061ff9839681cc903a37e8ad8e65..2f2440688d1c1379a38e0290d297d937fc62ab24 100644
--- a/content/browser/site_instance_impl.h
+++ b/content/browser/site_instance_impl.h
@@ -482,6 +482,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
@@ -497,6 +497,7 @@ class CONTENT_EXPORT SiteInstanceImpl final : public SiteInstance,
BrowserContext* GetBrowserContext() override;
const GURL& GetSiteURL() override;
scoped_refptr<SiteInstance> GetRelatedSiteInstance(const GURL& url) override;
@@ -228,7 +228,7 @@ index 350ca11e74fdb46e29288f5fb378d134c2f04c38..deb899ad6865beffaf85eac53b1b7cef
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 db80cb9d15af7f59a312d1030aee6682b3ef86c1..d6470f96eb8cd363fe89e2b1a9a54ab052022a27 100644
index 59c747a6f63a53eff7e2ca8d46a859f615638e3f..d6f3048ab90731424558f671b4ce78fa58fc40ff 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -71,6 +71,21 @@
@@ -254,10 +254,10 @@ index db80cb9d15af7f59a312d1030aee6682b3ef86c1..d6470f96eb8cd363fe89e2b1a9a54ab0
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 31214ab14f3643d8f6ab38673195322c5e33f757..dc3036dfd29cbd4a932de98c8834d64f4c4c5e7a 100644
index 584a98da0ccde8b87171c6b6343b484b48f2e289..44fe14bbffbce400ec2ab14e053939588bc92382 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -259,8 +259,45 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -260,8 +260,45 @@ class CONTENT_EXPORT ContentBrowserClient {
using IsClipboardPasteContentAllowedCallback =
base::OnceCallback<void(ClipboardPasteContentAllowed)>;

2
patches/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.spec b/tools/gritsettings/resource_ids.spec
index 59fcef58b37b533d0b1b81ea22ce8372b9072a88..7f74af94349c27a8da7054625d3ec5ba684fb910 100644
index a3b7304171d333dd4d4426ea27bc04841fd690a9..1e7bb7393615c607456060777a5a8a984a3ed928 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -739,6 +739,11 @@

4
patches/chromium/moves_background_color_setter_of_webview_to_blinks_webprefs_logic.patch
View File

@@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
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
index 8f2b579098a1e56a4f97fdcd9746d9b92f53a72a..ca724cdd65e0f5cb5b894e7d75cb89bee6fbc745 100644
index eb740d3685c2226f5af55dca1224bd5348ea0d0e..42f0ee71b2edfeca05f56d82fb3fba80c795e960 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -155,6 +155,7 @@
@@ -23,7 +23,7 @@ index 8f2b579098a1e56a4f97fdcd9746d9b92f53a72a..ca724cdd65e0f5cb5b894e7d75cb89be
#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/paint_record_builder.h"
@@ -1773,6 +1774,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1776,6 +1777,14 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);

8
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -43,10 +43,10 @@ index f06e0502ef1ae948a14462328369b2b4b7843a6a..8589d0d04456af39fadc2d7fb393625a
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1175f2a74089990b1929f38a706fd46b491ccc7e..5aa4123de68da549f665970168f431a3a994d42f 100644
index 24979412cf08fdec93d256bcf16d7dd1abdf4ff6..a0e7bcfa3f31ffe4142d80708df255cb6bcb8629 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4141,6 +4141,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4144,6 +4144,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@@ -71,7 +71,7 @@ index a45ad650fa97fead42b2c2eb527514a8f50295af..82e145e6a571727d907e85c7edc0e41c
bool IsShowingContextMenuOnPage() const override;
void DidChangeScreenOrientation() override;
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index ada26a7d33b79596cc161aa3a73e3698bd76de81..a65f15f0f5788faf44213d484989a2cb112b1e30 100644
index 3f30fc5b98e7c49580af585ec02b37d408002930..e1c233f1ba8f31b37396a0aa9ca967067beb7b17 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -14,6 +14,7 @@
@@ -82,7 +82,7 @@ index ada26a7d33b79596cc161aa3a73e3698bd76de81..a65f15f0f5788faf44213d484989a2cb
#include "content/public/browser/allow_service_worker_result.h"
#include "content/public/browser/cookie_access_details.h"
#include "content/public/browser/navigation_controller.h"
@@ -369,6 +370,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
@@ -370,6 +371,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// Invoked every time the WebContents changes visibility.
virtual void OnVisibilityChanged(Visibility visibility) {}

4
patches/chromium/scroll_bounce_flag.patch
View File

@@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index e7ad89e8b7f8c984c8c5550031ff13beb882ef57..183a55e58ee8aec957be17b589397ebd87ff4658 100644
index 645666d0715d0ff2c18166eebbe79adebe5eabd0..c898d8056f5a45c55f0cb16e4adf916e22d3e843 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1268,7 +1268,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
@@ -1271,7 +1271,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
}
bool RenderThreadImpl::IsElasticOverscrollEnabled() {

6
patches/chromium/web_contents.patch
View File

@@ -9,10 +9,10 @@ is needed for OSR.
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
index 468562a2060fee9c57f864da1b3e9f92a544c8b2..9ea418512971b355d27efa31a9803f1fade0b311 100644
index 3411741da5d4a703f9b8b98dca817a2646d4c3df..dde26e94cb89fa64f68f42d6749890fab1b8e305 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2724,6 +2724,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2727,6 +2727,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name, type);
@@ -25,7 +25,7 @@ index 468562a2060fee9c57f864da1b3e9f92a544c8b2..9ea418512971b355d27efa31a9803f1f
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2734,6 +2740,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2737,6 +2743,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}

4
patches/v8/add_realloc.patch
View File

@@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
Realloc on the v8 side.
diff --git a/include/v8.h b/include/v8.h
index 84401d6ed9e30b9f50261a1f7fba5da97dcb0b2a..139988dddd89b298fff0bf3c4f25e094b501ec1b 100644
index 6b672ca750cec5e93dad948007af9b062ed66beb..3fbba577edd160184fa431cb796025c9038b25bb 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -5373,6 +5373,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@@ -5374,6 +5374,13 @@ class V8_EXPORT ArrayBuffer : public Object {
*/
virtual void* AllocateUninitialized(size_t length) = 0;