vcl/skia/gdiimpl.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
New commits: commit a68e25937f719e4eed938969e458b126d44748e2 Author: Patrick Luby <[email protected]> AuthorDate: Sun Nov 17 19:35:56 2024 -0500 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 18 12:41:12 2024 +0100 tdf#163945 Lower priority of Skia flush timer Commit f4c2c7c79cfe4464ac596afda37b8904d06969db fixed tdf#157312 by lowering the timer priority to TaskPriority::POST_PAINT. But it caused tdf#163734 so it was reverted to TaskPriority::HIGHEST in commit 5a38e4f9798c5ff247aa57581adf2671485627fd. While reverting to TaskPriority::HIGHEST did not cause tdf#157312 to reoccur, it did cause tdf#163945 so set the timer priority to TaskPriority::HIGH_IDLE. This priority appears to be low enough to fix tdf#16394 without causing tdf#163734 to reoccur. Change-Id: Ifc2833a886d52117d46c02a80c88c674ad080824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176699 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index 94ad83038906..791ebe46a923 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -269,7 +269,16 @@ public: { mpGraphics->performFlush(); Stop(); - SetPriority(TaskPriority::HIGHEST); + // tdf#163945 Lower priority of Skia flush timer + // Commit f4c2c7c79cfe4464ac596afda37b8904d06969db fixed tdf#157312 + // by lowering the timer priority to TaskPriority::POST_PAINT. But + // it caused tdf#163734 so it was reverted to TaskPriority::HIGHEST + // in commit 5a38e4f9798c5ff247aa57581adf2671485627fd. + // While reverting to TaskPriority::HIGHEST did not cause tdf#157312 + // to reoccur, it did cause tdf#163945 so set the timer priority to + // TaskPriority::HIGH_IDLE. This priority appears to be low enough to + // fix tdf#16394 without causing tdf#163734 to reoccur. + SetPriority(TaskPriority::HIGH_IDLE); } };
