strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related: tdf#152703 Reuse existing CAMetalLayer to stop flicker

Browse source 
When live resizing a window, replacing the CAMetalLayer with each
resize event repaints the window's background which causes a
noticeable flicker. So reuse any existing CAMetalLayer already
assigned to the native view.

Change-Id: I03bda5f0d40b84606b6602961e5f0d3b0dfcc6ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177921
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
This commit is contained in:
Patrick Luby 2024-12-05 17:51:33 -05:00 committed by Patrick Luby
parent add6efb409
commit cd983f0af4
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
external/skia/macosmetal.patch.1 vendored
View file

@ -70,7 +70,32 @@ diff -ur skia.org/tools/window/mac/GaneshMetalWindowContext_mac.mm skia/tools/wi
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <QuartzCore/CAConstraintLayoutManager.h> #import <QuartzCore/CAConstraintLayoutManager.h>
@@ -65,8 +67,7 @@ @@ -52,7 +54,23 @@
SkASSERT(nil != fMainView);
- fMetalLayer = [CAMetalLayer layer];
+ // Related: tdf#152703 Reuse existing CAMetalLayer to stop flicker
+ // When live resizing a window, replacing the CAMetalLayer with each
+ // resize event repaints the window's background which causes a
+ // noticeable flicker. So reuse any existing CAMetalLayer already
+ // assigned to the native view.
+ BOOL reuseMetalLayer = NO;
+ if (fMainView.wantsLayer)
+ {
+ CALayer *pLayer = fMainView.layer;
+ if (pLayer && [pLayer isKindOfClass:[CAMetalLayer class]])
+ {
+ fMetalLayer = (__bridge CAMetalLayer*)pLayer;
+ reuseMetalLayer = YES;
+ }
+ }
+ if (!reuseMetalLayer)
+ fMetalLayer = [CAMetalLayer layer];
fMetalLayer.device = fShared->fDevice.get();
fMetalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm;
@@ -65,10 +83,10 @@
fMetalLayer.autoresizingMask = kCALayerHeightSizable | kCALayerWidthSizable; fMetalLayer.autoresizingMask = kCALayerHeightSizable | kCALayerWidthSizable;
fMetalLayer.contentsGravity = kCAGravityTopLeft; fMetalLayer.contentsGravity = kCAGravityTopLeft;
fMetalLayer.magnificationFilter = kCAFilterNearest; fMetalLayer.magnificationFilter = kCAFilterNearest;
@ -78,9 +103,13 @@ diff -ur skia.org/tools/window/mac/GaneshMetalWindowContext_mac.mm skia/tools/wi
- fMetalLayer.colorspace = cs.CGColorSpace; - fMetalLayer.colorspace = cs.CGColorSpace;
+ fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); + fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
fMainView.layer = fMetalLayer; - fMainView.layer = fMetalLayer;
+ if (!reuseMetalLayer)
+ fMainView.layer = fMetalLayer;
fMainView.wantsLayer = YES; fMainView.wantsLayer = YES;
@@ -85,6 +86,18 @@
return true;
@@ -85,6 +103,18 @@
fMetalLayer.drawableSize = backingSize; fMetalLayer.drawableSize = backingSize;
fMetalLayer.contentsScale = backingScaleFactor; fMetalLayer.contentsScale = backingScaleFactor;
@ -114,4 +143,3 @@ diff -ur skia.org/tools/window/mac/MacWindowInfo.h skia/tools/window/mac/MacWind
+SK_API void ResetBackingScaleFactor(); +SK_API void ResetBackingScaleFactor();
} // namespace skwindow } // namespace skwindow