summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-11-26 10:42:10 +0000
committerMichael Meeks <michael.meeks@collabora.com>2015-11-26 22:17:35 +0000
commit2c854ebae5879149261d6314061f43a379e32568 (patch)
tree2228180b83049fc3927808c6bf4f309d77086bd5
parent5fef25ead2caecde863eb2dae2c0da3070049d1b (diff)
vcl: fix event processing to idle - for JUnit tests.
Change-Id: Ibeb1f6627815fc34c6e166357c88e076b75f6abb Reviewed-on: https://gerrit.libreoffice.org/20197 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--include/vcl/scheduler.hxx6
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
-rw-r--r--vcl/source/app/scheduler.cxx19
3 files changed, 23 insertions, 4 deletions
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 6dd80307adc6..13d168727b78 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -92,8 +92,10 @@ public:
static void CallbackTaskScheduling( bool ignore );
/// Calculate minimum timeout - and return its value.
static sal_uInt64 CalculateMinimumTimeout( bool &bHasActiveIdles );
- /// Process one pending task ahead of time with highhest priority.
- static void ProcessTaskScheduling( bool bTimer );
+ /// Process one pending task ahead of time with highest priority.
+ static bool ProcessTaskScheduling( bool bTimerOnly );
+ /// Process all events until we are idle
+ static void ProcessEventsToIdle();
};
#endif // INCLUDED_VCL_SCHEDULER_HXX
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index a1100a866069..72a0cb4e4cfd 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1912,7 +1912,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()
throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
- Scheduler::ProcessTaskScheduling(false);
+ Scheduler::ProcessEventsToIdle();
}
OUString SAL_CALL VCLXToolkit::getHWOSConfInfo()
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index ba90ccaca771..e17686618bb2 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -157,7 +157,7 @@ void Scheduler::CallbackTaskScheduling(bool ignore)
Scheduler::ProcessTaskScheduling( false );
}
-void Scheduler::ProcessTaskScheduling( bool bTimerOnly )
+bool Scheduler::ProcessTaskScheduling( bool bTimerOnly )
{
ImplSchedulerData* pSchedulerData;
@@ -168,6 +168,23 @@ void Scheduler::ProcessTaskScheduling( bool bTimerOnly )
pSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
pSchedulerData->Invoke();
+ return true;
+ }
+ else
+ return false;
+}
+
+void Scheduler::ProcessEventsToIdle()
+{
+ // FIXME: really we should process incoming OS events too ...
+ int nSanity = 1000;
+ while (Scheduler::ProcessTaskScheduling(false))
+ {
+ if (nSanity-- < 0)
+ {
+ SAL_WARN("vcl.schedule", "Unexpected volume of events to process");
+ break;
+ }
}
}