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

fix: delay handling occlusion events to avoid flicker on macOS (#19315)

Browse Source 
* fix: delay handling occlusion events to avoid flicker on macOS (#18661)

* chore: add debounce on the updateWebContentsVisibility method to ensure quick changes in occlusion do not result in flickering

* chore: update old patch headers

(cherry picked from commit 0146cc0eb5)

* Update patch for 5-0-x

* Fix compilation errors
This commit is contained in:
John Kleinschmidt
2019-07-18 13:11:23 -04:00
committed by Shelley Vohr
parent 69ff736ace
commit 9b1147c7c9
2 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/common/chromium/.patches
View File

@@ -78,3 +78,4 @@ video_capturer_dirty_rect.patch
unsandboxed_ppapi_processes_skip_zygote.patch
autofill_size_calculation.patch
disable_detach_webview_frame.patch
chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch

65
patches/common/chromium/chore_add_debounce_on_the_updatewebcontentsvisibility_method_to.patch Normal file
View File

@@ -0,0 +1,65 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sattard@slack-corp.com>
Date: Wed, 5 Jun 2019 15:11:00 -0700
Subject: chore: add debounce on the updateWebContentsVisibility method to
ensure quick changes in occlusion do not result in flickering
diff --git a/content/browser/web_contents/web_contents_view_cocoa.h b/content/browser/web_contents/web_contents_view_cocoa.h
index 5b44f03eba6ff1a960d56d3d8613ccc98c30bf54..6f903c195e58f9e8c9322d92281d53ab130ef82b 100644
--- a/content/browser/web_contents/web_contents_view_cocoa.h
+++ b/content/browser/web_contents/web_contents_view_cocoa.h
@@ -64,6 +64,8 @@ CONTENT_EXPORT
- (void)clearWebContentsView;
- (void)closeTabAfterEvent;
- (void)updateWebContentsVisibility;
+- (content::mojom::Visibility)currentVisibility;
+- (void)notifyWebContentsVisibilityChanged;
- (void)viewDidBecomeFirstResponder:(NSNotification*)notification;
- (content::WebContentsImpl*)webContents;
@end
diff --git a/content/browser/web_contents/web_contents_view_cocoa.mm b/content/browser/web_contents/web_contents_view_cocoa.mm
index c34664635626c42667fd8206e790ace9ef01ad54..1ca1a6e8119efcf1d9513c2a59dcac06cee6c1fc 100644
--- a/content/browser/web_contents/web_contents_view_cocoa.mm
+++ b/content/browser/web_contents/web_contents_view_cocoa.mm
@@ -282,9 +282,14 @@ - (void)viewDidBecomeFirstResponder:(NSNotification*)notification {
client_->OnBecameFirstResponder(direction);
}
-- (void)updateWebContentsVisibility {
+- (void)notifyWebContentsVisibilityChanged {
if (!client_)
return;
+
+ client_->OnWindowVisibilityChanged([self currentVisibility]);
+}
+
+- (content::mojom::Visibility)currentVisibility {
content::mojom::Visibility visibility = content::mojom::Visibility::kVisible;
if ([self isHiddenOrHasHiddenAncestor] || ![self window])
visibility = content::mojom::Visibility::kHidden;
@@ -292,7 +297,24 @@ - (void)updateWebContentsVisibility {
visibility = content::mojom::Visibility::kVisible;
else
visibility = content::mojom::Visibility::kOccluded;
- client_->OnWindowVisibilityChanged(visibility);
+ return visibility;
+}
+
+- (void)updateWebContentsVisibility {
+ if (!client_)
+ return;
+ // Cancel any pending notifications visibility changes, this ensures that the latest incoming change is the only
+ // change that will take affect
+ [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(notifyWebContentsVisibilityChanged) object:nil];
+
+ content::mojom::Visibility visibility = [self currentVisibility];
+
+ // If it's visible, notify immediately to render ASAP
+ if (visibility == content::mojom::Visibility::kVisible)
+ client_->OnWindowVisibilityChanged(visibility);
+ else
+ // If it's occluded queue it for 3 seconds to be sure that it isn't a double kOccluded -> kVisible
+ [self performSelector:@selector(notifyWebContentsVisibilityChanged) withObject:nil afterDelay:3.0];
}
- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {