Title: [260110] branches/safari-610.1.10-branch/Source/WebKit
- Revision
- 260110
- Author
- [email protected]
- Date
- 2020-04-14 18:07:13 -0700 (Tue, 14 Apr 2020)
Log Message
Cherry-pick r260104. rdar://problem/61800020
REGRESSION (r259898): Tabs occasionally go blank and get stuck that way
https://bugs.webkit.org/show_bug.cgi?id=210520
<rdar://problem/61776830>
Reviewed by Simon Fraser.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::setAcceleratedCompositingRootLayer):
setThumbnailView calls setAcceleratedCompositingRootLayer in order to reconnect the
existing root layer. After r259898, this would cause us to go down the
process-swap path, and hide the root layer, and nothing would ever
come along and fix it.
If setAcceleratedCompositingRootLayer is called with the existing root
layer, that cannot be a process swap, so ignore it and proceed as before.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260104 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.10-branch/Source/WebKit/ChangeLog (260109 => 260110)
--- branches/safari-610.1.10-branch/Source/WebKit/ChangeLog 2020-04-14 23:59:30 UTC (rev 260109)
+++ branches/safari-610.1.10-branch/Source/WebKit/ChangeLog 2020-04-15 01:07:13 UTC (rev 260110)
@@ -1,3 +1,44 @@
+2020-04-14 Russell Epstein <[email protected]>
+
+ Cherry-pick r260104. rdar://problem/61800020
+
+ REGRESSION (r259898): Tabs occasionally go blank and get stuck that way
+ https://bugs.webkit.org/show_bug.cgi?id=210520
+ <rdar://problem/61776830>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::setAcceleratedCompositingRootLayer):
+ setThumbnailView calls setAcceleratedCompositingRootLayer in order to reconnect the
+ existing root layer. After r259898, this would cause us to go down the
+ process-swap path, and hide the root layer, and nothing would ever
+ come along and fix it.
+
+ If setAcceleratedCompositingRootLayer is called with the existing root
+ layer, that cannot be a process swap, so ignore it and proceed as before.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260104 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-14 Tim Horton <[email protected]>
+
+ REGRESSION (r259898): Tabs occasionally go blank and get stuck that way
+ https://bugs.webkit.org/show_bug.cgi?id=210520
+ <rdar://problem/61776830>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::setAcceleratedCompositingRootLayer):
+ setThumbnailView calls setAcceleratedCompositingRootLayer in order to reconnect the
+ existing root layer. After r259898, this would cause us to go down the
+ process-swap path, and hide the root layer, and nothing would ever
+ come along and fix it.
+
+ If setAcceleratedCompositingRootLayer is called with the existing root
+ layer, that cannot be a process swap, so ignore it and proceed as before.
+
2020-04-12 Carlos Garcia Campos <[email protected]>
[GTK] Use gdk_window_move_to_rect() to position popup menus
Modified: branches/safari-610.1.10-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (260109 => 260110)
--- branches/safari-610.1.10-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2020-04-14 23:59:30 UTC (rev 260109)
+++ branches/safari-610.1.10-branch/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2020-04-15 01:07:13 UTC (rev 260110)
@@ -3815,7 +3815,7 @@
// This is the process-swap case. We add the new layer behind the existing root layer and mark it as hidden.
// This way, the new layer gets accelerated compositing but won't be visible until
// setAcceleratedCompositingRootLayerAfterFlush() is called, in order to prevent flashing.
- if (m_rootLayer && rootLayer) {
+ if (m_rootLayer && rootLayer && m_rootLayer != rootLayer) {
if (m_thumbnailView)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
