summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Luby <guibmacdev@gmail.com>2024-11-17 19:35:56 -0500
committerPatrick Luby <guibomacdev@gmail.com>2024-11-18 13:52:46 +0100
commitdbe8a75f7933d3f63a6fdd54f0c562a944b53975 (patch)
treea2665aa6267c5e00df2d441b79b0f497cb051af1
parent3c371b7bde13c02ad644db7702fb5770d0d25e47 (diff)
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/+/176698 Reviewed-by: Patrick Luby <guibomacdev@gmail.com> Tested-by: Jenkins
-rw-r--r--vcl/skia/gdiimpl.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 25af7f76603d..eaf0051bacea 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);
}
};