summaryrefslogtreecommitdiff
path: root/vcl/osx
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2016-09-08 06:55:30 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2017-07-13 12:10:21 +0200
commitd348035a60361a1b9ba9eb7b67013204a24a6633 (patch)
tree85e7e4ff2dd926ef9d2907b4f4900815bdbb96c5 /vcl/osx
parent1782893282a4543e946e6b2c8de863b10fab0c85 (diff)
Drop special idle handling
Idles are just instant timers, which should most time have a low priority, By dropping most special idle handling we'll just schedule by priority. This also reverts SalYieldResult back to a bool, which just indicates if any event was processed. Change-Id: Ia0b91b06dffb77af066f01838d8f9483523bf67d
Diffstat (limited to 'vcl/osx')
-rw-r--r--vcl/osx/salinst.cxx11
-rw-r--r--vcl/osx/salnstimer.mm3
-rw-r--r--vcl/osx/saltimer.cxx6
3 files changed, 6 insertions, 14 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index cbc24100e42a..c1890c8d5eb7 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -559,7 +559,7 @@ class ReleasePoolHolder
~ReleasePoolHolder() { [mpPool release]; }
};
-SalYieldResult AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong const nReleased)
+bool AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong const nReleased)
{
(void) nReleased;
assert(nReleased == 0); // not implemented
@@ -600,7 +600,7 @@ SalYieldResult AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents
maWaitingYieldCond.set();
// return if only one event is asked for
if( ! bHandleAllCurrentEvents )
- return SalYieldResult::EVENT;
+ return true;
}
}
@@ -661,10 +661,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
// this cause crashes on MacOSX 10.4
// [AquaSalTimer::pRunningTimer fire];
if (ImplGetSVData()->maSchedCtx.mpSalTimer != nullptr)
- {
- bool const idle = true; // TODO
- ImplGetSVData()->maSchedCtx.mpSalTimer->CallCallback( idle );
- }
+ ImplGetSVData()->maSchedCtx.mpSalTimer->CallCallback();
}
}
@@ -717,7 +714,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
}
}
- return bHadEvent ? SalYieldResult::EVENT : SalYieldResult::TIMEOUT;
+ return bHadEvent;
}
bool AquaSalInstance::AnyInput( VclInputFlags nType )
diff --git a/vcl/osx/salnstimer.mm b/vcl/osx/salnstimer.mm
index 3c67b8b7f593..00f67e52cd26 100644
--- a/vcl/osx/salnstimer.mm
+++ b/vcl/osx/salnstimer.mm
@@ -35,8 +35,7 @@
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->maSchedCtx.mpSalTimer )
{
- bool const idle = true; // TODO
- pSVData->maSchedCtx.mpSalTimer->CallCallback( idle );
+ pSVData->maSchedCtx.mpSalTimer->CallCallback();
// NSTimer does not end nextEventMatchingMask of NSApplication
// so we need to wakeup a waiting Yield to inform it something happened
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index 86e42553d097..0221c81a17ae 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -101,11 +101,7 @@ void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent )
{
SolarMutexGuard aGuard;
if( pSVData->maSchedCtx.mpSalTimer )
- {
- // timer already elapsed since event posted
- bool const idle = true; // TODO
- pSVData->maSchedCtx.mpSalTimer->CallCallback( idle );
- }
+ pSVData->maSchedCtx.mpSalTimer->CallCallback();
}
ImplSalStartTimer( sal_uLong( [pEvent data1] ) );
}