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 85.0.4183.70 (10-x-y) (#24953)

Browse Source 
* chore: bump chromium in DEPS to 85.0.4183.69

* update patches

* Update patches

* Fixup patch update

* no, really fix it up this time

* chore: bump chromium in DEPS to 85.0.4183.70

* update patches

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot
2020-08-13 10:24:17 -07:00
committed by GitHub
parent 5c19e983f9
commit 8e1daa4449
9 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -14,7 +14,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'85.0.4183.66',
'85.0.4183.70',
'node_version':
'v12.16.3',
'nan_version':

10
patches/chromium/can_create_window.patch
View File

@@ -9,7 +9,7 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1531d69cfe3d6c975073d293edf15e0bc4d9325b..0944fe0f52b4861b6584e02437fb7e186ff12004 100644
index 4f9c570cb14297b28eddda03fe4860342bd06cf6..e640c71b9370b6303a4132e5481a787b812a4376 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -4816,6 +4816,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -21,7 +21,7 @@ index 1531d69cfe3d6c975073d293edf15e0bc4d9325b..0944fe0f52b4861b6584e02437fb7e18
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9917f0595f8131e3acc328dcf005b1e8685d9f36..f7d91b17c304f6676363e60104e3c6ef3a933d9e 100644
index c8ba444365d3391056ff58c0e513bb0ad0a5f9b6..4b72590b9ae6994ca6fd2e56d46b3b5c5178aeb6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3087,9 +3087,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -38,10 +38,10 @@ index 9917f0595f8131e3acc328dcf005b1e8685d9f36..f7d91b17c304f6676363e60104e3c6ef
for (auto& observer : observers_) {
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 118a262e5e18c22df6a01312b9f99b235d60ae50..329a92f9c0089cf8f94c7cd2fe990204c670419c 100644
index 40821a2c3d7cf13136944e5bc6852047045a6be2..90c3ab998a8707eb91fc016ce56e9248194deeeb 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -277,6 +277,10 @@ struct CreateNewWindowParams {
@@ -278,6 +278,10 @@ struct CreateNewWindowParams {
// The window features to use for the new window.
blink.mojom.WindowFeatures features;
@@ -135,7 +135,7 @@ index e545ff70c612e98cdd79230303273a3ec7bfcaac..405152e0e90bc76b7de9c3e6946944f3
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index c6a990f873066fec1ac7ce5e088ecd02d2142e71..272b613f658ef4bfa3869cbd17d342ceef665142 100644
index efab61352658f6d1dc9370c8826af25e22b97b38..c1b0d1f5f7acb82f559ba90f24b6f9e5e7c44dad 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -67,6 +67,7 @@

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 8f5c0d2944818318fb0c3c0ae8a7cf36b1ec561c..240d21e57360ffd387c041fde7062ecd321819a1 100644
index 995b99c5ba9d388de83d6a4dc30bf0ae74fbeb4a..879703baee2017a272e4b8d2f4ce976ed712e155 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5536,6 +5536,7 @@ static_library("browser") {
@@ -5538,6 +5538,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

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 eeab47ebc93b9a75775faee87037049541f71dd6..54c3d886a18d25f02e37686dca123d9256a5af34 100644
index 2c8bb4fe9c8cf592cc83fce164f21209e5dd1465..a6fde7b42fd854a56226acb4766274621aa7b3e6 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1862,6 +1862,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@@ -1861,6 +1861,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
gfx::ColorSpace LayerTreeHostImpl::GetRasterColorSpace(
gfx::ContentColorUsage content_color_usage) const {

8
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
View File

@@ -6,7 +6,7 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index f2c4cbf786188b8aa5dad1e7f2b8ae9c785aaed9..2882ef3371960cc914ac27e9b6eedd09ff34cb63 100644
index c5140471ec2ade58948972f433d79c11932e2f17..12db0a89ac0f37ecab137841264ddd108d622dc8 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -512,6 +512,10 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -21,7 +21,7 @@ index f2c4cbf786188b8aa5dad1e7f2b8ae9c785aaed9..2882ef3371960cc914ac27e9b6eedd09
return is_active();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index c0943cbdd019a37474e1727b8282b7138475e74f..cb58b299976745edb6e3f0d13687301b7fc61a10 100644
index e1f95d702844a687342f484e3c572686064dc498..0233242c0d2b4bde4e32931f30777ee26dc02619 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -110,6 +110,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@@ -61,7 +61,7 @@ index dfd856eb481114fea9da3e26b4080c9a8473acf6..604a95a0427705eca523e91b08a136f8
//
// Returns the current WebKit preferences. Note: WebPreferences is cached, so
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 272b613f658ef4bfa3869cbd17d342ceef665142..461310b69c823546f99d99b087b9ea005167a883 100644
index c1b0d1f5f7acb82f559ba90f24b6f9e5e7c44dad..dacde7b382a698309e3b5644003d359e273d5bd1 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1170,6 +1170,8 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) {
@@ -73,7 +73,7 @@ index 272b613f658ef4bfa3869cbd17d342ceef665142..461310b69c823546f99d99b087b9ea00
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck)
IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences)
IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted)
@@ -1666,6 +1668,12 @@ bool RenderViewImpl::GetContentStateImmediately() {
@@ -1667,6 +1669,12 @@ bool RenderViewImpl::GetContentStateImmediately() {
return send_content_state_immediately_;
}

2
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,7 +13,7 @@ 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 f7d91b17c304f6676363e60104e3c6ef3a933d9e..4fb741c77ef6faf9246bd028f1a040c1275fafe2 100644
index 4b72590b9ae6994ca6fd2e56d46b3b5c5178aeb6..960564056447f18eb629db2e03e05393ffc539f8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {

32
patches/chromium/provide_axtextchangevaluestartmarker_for_macos_a11y_value_change.patch
View File

@@ -71,7 +71,7 @@ index 7b721327bbe784314f4523bc7164182af3f53299..baf338dd58e9223b6cfb313c31bbdb19
// Returns browser accessibility range for the given AXTextMarkerRange.
BrowserAccessibilityPosition::AXRangeType AXTextMarkerRangeToRange(id);
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 84cb0fe898631353ade5b205cc061c7e8622301d..a3be88aa4297a490469c3aa01187a11d666314a9 100644
index eae637ff66da54ec2cba43107504ee3133d5fb2c..5038378864a6dd78bd470e068049d0e4beef2f5c 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -711,6 +711,20 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
@@ -95,10 +95,14 @@ index 84cb0fe898631353ade5b205cc061c7e8622301d..a3be88aa4297a490469c3aa01187a11d
#if defined(MAC_OS_X_VERSION_10_12) && \
(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)
#warning NSAccessibilityRequiredAttributeChrome \
@@ -1876,7 +1890,12 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor,
base::string16 deletedText = oldValue.substr(i, oldValue.length() - i - j);
base::string16 insertedText = newValue.substr(i, newValue.length() - i - j);
@@ -1890,10 +1904,15 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor,
if (size_t{sel_start} == newValue.length() &&
size_t{sel_end} == newValue.length()) {
// Don't include oldValue as it would be announced -- very confusing.
- return content::AXTextEdit(newValue, base::string16());
+ return content::AXTextEdit(newValue, base::string16(), nil);
}
}
- return content::AXTextEdit(insertedText, deletedText);
+#ifndef MAS_BUILD
+ return content::AXTextEdit(insertedText, deletedText,
@@ -109,7 +113,7 @@ index 84cb0fe898631353ade5b205cc061c7e8622301d..a3be88aa4297a490469c3aa01187a11d
}
- (BOOL)instanceActive {
@@ -2251,7 +2270,9 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor,
@@ -2268,7 +2287,9 @@ id content::AXTextMarkerFrom(const BrowserAccessibilityCocoa* anchor,
- (id)selectedTextMarkerRange {
if (![self instanceActive])
return nil;
@@ -183,7 +187,7 @@ index 8fb447a74cb6e818c221131aba5f57c5f8b8094d..b930963467642738db3ec0109b4a6681
void AnnounceActiveDescendant(BrowserAccessibility* node) const;
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 462577a0dbd0fcc1baf17acd9678317cb27503fa..90bdee0cf769e872f2e9585eb5055429f12a9eda 100644
index 9163ae35ba4dc81cbe9b8d8d4a456e8d36c3eede..90bdee0cf769e872f2e9585eb5055429f12a9eda 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -94,6 +94,8 @@ NSString* const NSAccessibilityTextSelectionChangedFocus =
@@ -217,7 +221,7 @@ index 462577a0dbd0fcc1baf17acd9678317cb27503fa..90bdee0cf769e872f2e9585eb5055429
BrowserAccessibility* root = GetRoot();
if (!root)
@@ -544,27 +548,42 @@ NSDictionary*
@@ -544,29 +548,42 @@ NSDictionary*
BrowserAccessibilityManagerMac::GetUserInfoForValueChangedNotification(
const BrowserAccessibilityCocoa* native_node,
const base::string16& deleted_text,
@@ -248,17 +252,15 @@ index 462577a0dbd0fcc1baf17acd9678317cb27503fa..90bdee0cf769e872f2e9585eb5055429
+ [changes addObject:change];
}
if (!inserted_text.empty()) {
- // TODO(nektar): Figure out if this is a paste operation instead of typing.
- // Changes to Blink would be required.
// TODO(nektar): Figure out if this is a paste, insertion or typing.
// Changes to Blink would be required. A heuristic is currently used.
auto edit_type = inserted_text.length() > 1 ? @(AXTextEditTypeInsert)
: @(AXTextEditTypeTyping);
- [changes addObject:@{
- NSAccessibilityTextEditType : @(AXTextEditTypeTyping),
- NSAccessibilityTextEditType : edit_type,
- NSAccessibilityTextChangeValueLength : @(inserted_text.length()),
- NSAccessibilityTextChangeValue : base::SysUTF16ToNSString(inserted_text)
- }];
+ // TODO(nektar): Figure out if this is a paste, insertion or typing.
+ // Changes to Blink would be required. A heuristic is currently used.
+ auto edit_type = inserted_text.length() > 1 ? @(AXTextEditTypeInsert)
+ : @(AXTextEditTypeTyping);
+ NSMutableDictionary* change =
+ [NSMutableDictionary dictionaryWithDictionary:@{
+ NSAccessibilityTextEditType : edit_type,

6
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -43,7 +43,7 @@ index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5
void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) {
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 204541d24b2a67de2ba3075acd4015fd09ccf8b3..c82da3db6468a417f7f555f88e60a1d5ba21c4d6 100644
index 7c527fc81a07c7060c78b8e95dc3b79313cc38b5..a7e9ee78ecb5bd9a7e0bf37d24d526de60f8a55a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3588,6 +3588,11 @@ bool WebContentsImpl::OnUpdateDragCursor() {
@@ -59,7 +59,7 @@ index 204541d24b2a67de2ba3075acd4015fd09ccf8b3..c82da3db6468a417f7f555f88e60a1d5
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 353addcc1e7646e7ddc14a8d253d622ced94f34d..b62b7aafc2dcfa281cf82b9d8088b053db425417 100644
index b58cd9a57001be622849b992b22c196c76c40ac8..d57e3f2dd258a29de7c737228d80d377e50f036a 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -71,7 +71,7 @@ index 353addcc1e7646e7ddc14a8d253d622ced94f34d..b62b7aafc2dcfa281cf82b9d8088b053
bool AddDomainInfoToRapporSample(rappor::Sample* sample) override;
bool IsShowingContextMenuOnPage() const override;
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 0cab1ba9e1efa9695fb0a12d71b6e960356460a6..fa831aaf51ba4bc20e68d0541eb657444ef37ab5 100644
index 231047ad1fe15c2594ffb3594c047ec21e692664..91ec1d7dcd307dcaba5ff9bf22306a13a839b3fb 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -14,6 +14,7 @@

2
patches/chromium/web_contents.patch
View File

@@ -9,7 +9,7 @@ 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 4fb741c77ef6faf9246bd028f1a040c1275fafe2..204541d24b2a67de2ba3075acd4015fd09ccf8b3 100644
index 960564056447f18eb629db2e03e05393ffc539f8..7c527fc81a07c7060c78b8e95dc3b79313cc38b5 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {