Skip to content

Commit

Permalink
Fixup patch indices
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Dec 7, 2020
1 parent 55547b8 commit 0c42f3b
Show file tree
Hide file tree
Showing 31 changed files with 111 additions and 111 deletions.
22 changes: 11 additions & 11 deletions patches/chromium/add_didinstallconditionalfeatures.patch
Expand Up @@ -23,10 +23,10 @@ index c005ab29708f0d5b172f7a06f340ff01d35dc5dc..62c6f5e1527ff9bc546ba40f49a22551
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index de76a54c2269de90df7b614ec0cc8c27a41f5aa0..2a7cc8f8d0f1914f081c1aaeac39d504d6f13002 100644
index 33e6dfca2df06ecf538ad48eb2b89f794ea207ad..536b5a72f4994bde01c6c96ffbca74499ad39a7c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4734,6 +4734,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4716,6 +4716,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

Expand All @@ -40,10 +40,10 @@ index de76a54c2269de90df7b614ec0cc8c27a41f5aa0..2a7cc8f8d0f1914f081c1aaeac39d504
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 0798db292b4c7c6e1dc0dc7002e3567ba018b101..2db0d18f7c17e68f692f6406443195582e7de54f 100644
index 3a72bb59fa3cb7748d1ca038504e11d72bf6a09b..9c50ea4ea8a231b55a9097515c7de316605c927a 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -660,6 +660,8 @@ class CONTENT_EXPORT RenderFrameImpl
@@ -657,6 +657,8 @@ class CONTENT_EXPORT RenderFrameImpl
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
void DidCreateScriptContext(v8::Local<v8::Context> context,
int world_id) override;
Expand Down Expand Up @@ -79,10 +79,10 @@ index 16d2cc458b3a61c0974b258111ad154be61d55db..119f080e0ea00300dc4df8e9ec14d735
if (World().IsMainWorld()) {
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
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 40cb1dab285b28cf82a5911337e1dcb21d96c3e6..af56da4215304937b155e43830a847ef7af26cc1 100644
index f84f72609f7e7dbb248db96756f01704fd2047ac..b1053f337d1b4b7560bb5dd0927602b357f20aac 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -293,6 +293,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -292,6 +292,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {

virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) = 0;
Expand All @@ -92,10 +92,10 @@ index 40cb1dab285b28cf82a5911337e1dcb21d96c3e6..af56da4215304937b155e43830a847ef
int32_t world_id) = 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
index 2541f5273de20bb25ecd53628e4692af3f120a12..67614ddab6069a0fd8088c61ee40d11b5d6f75ae 100644
index c7caa0e7a8a4ba021ce9c8fbbedda3c61db796b6..a437303911bfa62b001da44256518b12aa342a3c 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -416,6 +416,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -417,6 +417,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
web_frame_->Client()->DidCreateScriptContext(context, world_id);
}

Expand All @@ -110,7 +110,7 @@ index 2541f5273de20bb25ecd53628e4692af3f120a12..67614ddab6069a0fd8088c61ee40d11b
v8::Local<v8::Context> context,
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
index 02f98349906389e811597d669721771860ec6ae5..30dfbfc4964ce2a6722a701dbeedad60d0882e23 100644
index cb73777817af019cc807e400dd0efcf632688215..e57af1cb37e3d73eb12819dc2e3926ecaf600b07 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
Expand All @@ -123,10 +123,10 @@ index 02f98349906389e811597d669721771860ec6ae5..30dfbfc4964ce2a6722a701dbeedad60
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
index 0e07fb9b25d3c1c60cf8b1c9a2cc2136e24495b9..cd277eb07e0d946a7114c5ec1906b3d905ec1d0d 100644
index 871023f276bf8a3c47764477f0037c5ab97a349d..ee451fc5e0d7c395b9b73b9612d92c20fe228565 100644
--- a/third_party/blink/renderer/core/loader/empty_clients.h
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
@@ -335,6 +335,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
@@ -334,6 +334,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) override {}
Expand Down
Expand Up @@ -49,7 +49,7 @@ index ec89eeb056d686f8cab6003e456973ff8649df23..108b3a8082d10fd655b965bd6a703a75
// the per-context allow patterns that is managed via NetworkContext
// interface. This still respects the per-context block lists.
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
index 9b2a1717c627de258a25cd4559e644f899c428ea..65ba4b077cb0795955cda70334072fc516f1bc50 100644
index 65bb883657aab4b588d505d78ad9e84a8eb36d16..f4ffe42e45ff2e821ae175cf3eb2dd9da40f93ba 100644
--- a/services/network/url_loader.cc
+++ b/services/network/url_loader.cc
@@ -463,6 +463,7 @@ URLLoader::URLLoader(
Expand All @@ -72,7 +72,7 @@ index 9b2a1717c627de258a25cd4559e644f899c428ea..65ba4b077cb0795955cda70334072fc5
if (want_raw_headers_) {
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
@@ -1158,7 +1164,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -1159,7 +1165,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
// |this| may have been deleted.
return;
}
Expand All @@ -81,7 +81,7 @@ index 9b2a1717c627de258a25cd4559e644f899c428ea..65ba4b077cb0795955cda70334072fc5
OnAuthCredentials(base::nullopt);
return;
}
@@ -1174,11 +1180,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
@@ -1175,11 +1181,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
if (url_request->response_headers())
head->headers = url_request->response_headers();
head->auth_challenge_info = auth_info;
Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/blink_local_frame.patch
Expand Up @@ -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 2af284f7e328dac2a494c80a6adb6b0333c72cbc..d770e50972b09a23a664b9c9a483378f985b5057 100644
index 7494f3eaa8dda5c4f8d5d8e46514fa0767b4b750..ba30bb5d4f50d9f536af2bcbf1cbb84f20ba78e9 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -642,10 +642,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -641,10 +641,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());

Expand All @@ -28,7 +28,7 @@ index 2af284f7e328dac2a494c80a6adb6b0333c72cbc..d770e50972b09a23a664b9c9a483378f
if (!Client())
return;

@@ -662,6 +658,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
@@ -661,6 +657,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
// Notify WindowProxyManager that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy.
GetWindowProxyManager()->ClearForClose();
Expand Down
22 changes: 11 additions & 11 deletions patches/chromium/can_create_window.patch
Expand Up @@ -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 cb5b9b4aac58d9c2b8ce250344342ff02c1d2aa5..a9b48da691e8b0be16b2bb51f06356508bad6b43 100644
index bd4f5fefc10ea5366846baca5e936440e861c3d4..d4fbb821e35335fd69820e429447690b01a7fe59 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5092,6 +5092,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5116,6 +5116,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,
Expand All @@ -21,7 +21,7 @@ index cb5b9b4aac58d9c2b8ce250344342ff02c1d2aa5..a9b48da691e8b0be16b2bb51f0635650
&no_javascript_access);

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0e918ffab3d5923df90c8895bbe6c879e5348e2c..3304933bc0e20bd1d4ee36dd930096dd9ac394bf 100644
index 16d2127e706bf4839f596c975e88a0bf4337b3c4..382e7d01444f55650971a0cade2211fab2a37754 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3598,6 +3598,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
Expand Down Expand Up @@ -53,10 +53,10 @@ index 0e918ffab3d5923df90c8895bbe6c879e5348e2c..3304933bc0e20bd1d4ee36dd930096dd
observer->DidOpenRequestedURL(new_contents_impl, opener, params.target_url,
params.referrer.To<Referrer>(),
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 8c41fa66fed10b19c0b59b5b9da2cb2831a359dc..eb91c99dc5cc2e0f48115f28d528cd27859e2151 100644
index e959809bb8d20294e3946a73631667e71fca8ec7..68923a8f48ccec81cbc24cff70958cc19f2c00b1 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -282,6 +282,10 @@ struct CreateNewWindowParams {
@@ -275,6 +275,10 @@ struct CreateNewWindowParams {

// The window features to use for the new window.
blink.mojom.WindowFeatures features;
Expand All @@ -68,10 +68,10 @@ index 8c41fa66fed10b19c0b59b5b9da2cb2831a359dc..eb91c99dc5cc2e0f48115f28d528cd27

// 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 8aa1b194f9c23bcda555ff870d645c040e88d1df..2181817161721fa0749616b1e1bc4b79142a822f 100644
index e1c6c1f7ca02fc5b8d379e435be6d52572e16266..2b0dd7cd7bdfcdc0c5a2e947e7f5faee86546330 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -543,6 +543,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -544,6 +544,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
Expand All @@ -81,7 +81,7 @@ index 8aa1b194f9c23bcda555ff870d645c040e88d1df..2181817161721fa0749616b1e1bc4b79
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 4cdd98db86a37ed8143e0bfff04ba530bff8f00d..1e5a588e6a6d92244ab6d881232a30dabe2352bd 100644
index 2a341fb5d2f9636c827b9f162d7bf0fcd66fe2e1..79d88cab12a1bce6e386fc470622d670bfaa6730 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -150,6 +150,7 @@ class NetworkService;
Expand All @@ -92,7 +92,7 @@ index 4cdd98db86a37ed8143e0bfff04ba530bff8f00d..1e5a588e6a6d92244ab6d881232a30da
} // namespace network

namespace sandbox {
@@ -873,6 +874,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -874,6 +875,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
Expand Down Expand Up @@ -221,10 +221,10 @@ index 4f735ad0d97eaac9a57dad137e479f8a7ec33a36..0a3c5821962c85609b64b3625fa6b8d6

} // 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
index 28c705aed9f7bb4f8d91a02b07d7564ab9c78167..38c8c81cb92a360291c23b392c6956de5db9347c 100644
index fa07443f71c1a0ab3780290157cbe6db04dae8f7..271da1447c0efe17b245f556d5ce3f9b3fb22ae2 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1966,6 +1966,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -1952,6 +1952,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
}

WebWindowFeatures window_features = GetWindowFeaturesFromString(features);
Expand Down
Expand Up @@ -140,10 +140,10 @@ index dc7f3bc886e7130c66d98ae6de73c17db746cbe5..6197db3570c860f39f381370e1af37f8
}

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3dd7a7f1963c5567c547d17a6f92065b969c36f4..841e6eecfe0e8aa5cc07c0f325fb7681fd68949d 100644
index 93bc1b4289ed14bd59c640351a83efee949bf75a..d36a754c8abc98f124c2d295b78beadddf5ae2d9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1794,12 +1794,11 @@ bool Browser::IsWebContentsCreationOverridden(
@@ -1798,12 +1798,11 @@ bool Browser::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
Expand All @@ -159,10 +159,10 @@ index 3dd7a7f1963c5567c547d17a6f92065b969c36f4..841e6eecfe0e8aa5cc07c0f325fb7681

WebContents* Browser::CreateCustomWebContents(
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 9c880452916ae70cb3549e29b70079bfb3cad8e4..a1f21ec1a6a085fc331c41cf2a255f3e804f8645 100644
index 923b9d25f98431c7d44c9abdd070d6358d2476a4..5a434f45d319d03f9dc8db2211f199ed1265c702 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -777,8 +777,7 @@ class Browser : public TabStripModelObserver,
@@ -780,8 +780,7 @@ class Browser : public TabStripModelObserver,
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
Expand Down Expand Up @@ -264,7 +264,7 @@ 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 ae6ba78f929e0508c96eeda50527f2b20b700d76..49c511d57933ad45045e82accb98831aa8fe16b6 100644
index f940851b87541cb245a7439f100275c6694cee0f..97623546b3d8c44759338f3dab02aa34be71a8e4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3559,8 +3559,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
Expand Down
Expand Up @@ -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 145e15401da8aedff9efc6ef3befc9b278ec4f97..c6b18f94cd50823adb1492cdfb284d53345e5c66 100644
index d922c9c06965c1833fdbdaebabcf5ac8cc1e6cab..76d9806c0f2e25aa119a7e353db9e709b0b80d70 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6148,6 +6148,7 @@ static_library("browser") {
@@ -6156,6 +6156,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/dcheck.patch
Expand Up @@ -17,7 +17,7 @@ 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 30eb7b407237c73228746bd13de83d5243f49128..ed7288b627ac0dc1f3bc2cbaa5f351d96b048ad4 100644
index 44a9cde381d323183ae25490d5f07511ab2126d5..ea5b2dd99037ea531f74f1930bd1626cfc0d93bf 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -1306,8 +1306,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
Expand Down
Expand Up @@ -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 aa611448285b490699bfc966c31dec6d281c7df7..1b3eaf2c54f63e12fcbbeb8d698521d6abcf58d3 100644
index c0823fa0abedf954155294a8d84c62640aa7175f..abdb7ffb1d606b972025689350c60b09650fe24a 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -672,7 +672,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -676,7 +676,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
}
#endif

Expand Down
6 changes: 3 additions & 3 deletions patches/chromium/disable_color_correct_rendering.patch
Expand Up @@ -241,7 +241,7 @@ index 28799999f686d71c905efd9becc5b6fcb2a4fca2..87b2a9846a2f8192a8d5c27a644f98a6
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
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
index 2613372e88ed80e170e47e913c13949ee568db4e..4479845bd7bcba4d59e94dd1f48b46637fe42af0 100644
index 1b4d95b6dd43bcb030bba4aa1f2454c7466c82ba..3967ee4920aaeffa9aa52535eee275eb5ad7872f 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 @@
Expand Down Expand Up @@ -327,7 +327,7 @@ index 008619ad943c432b5bc013943195be9b7995213e..042c9eb43bbe1fb34cf86f53072c249e
// is what the renderer uses if its not threaded.
settings.enable_checker_imaging =
diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
index ba38d82e00c85ccedb380bc32d55084579941437..5b25a57e7c0b423737b147fabd5f9b28e4b77f33 100644
index e5fd0a36f83e14f13ad37525266076d791829900..f75d17d9506e7f9aad9f95a9a2026db4dda2706e 100644
--- a/ui/gfx/mac/io_surface.cc
+++ b/ui/gfx/mac/io_surface.cc
@@ -20,6 +20,7 @@
Expand All @@ -353,7 +353,7 @@ index ba38d82e00c85ccedb380bc32d55084579941437..5b25a57e7c0b423737b147fabd5f9b28
// Allow but ignore invalid color spaces.
if (!color_space.IsValid())
return true;
@@ -302,6 +311,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
@@ -297,6 +306,15 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
DCHECK_EQ(kIOReturnSuccess, r);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/disable_compositor_recycling.patch
Expand Up @@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.

diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 07864c37dd5f6fe9b206f69148bf180796e25d62..79d79ab6f862b5cde53ec973e99eb833c468fddb 100644
index 5c53aad7e3cb709cfa6ec841978722fdab07422d..103437c715e375b4da2c34911e26022d71ea65a9 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -484,7 +484,11 @@
@@ -478,7 +478,11 @@
return;

host()->WasHidden();
Expand Down

0 comments on commit 0c42f3b

Please sign in to comment.