[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/headless

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 17ff426190a605e58314c8f5e7440a37c87a3af1
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon May 13 14:22:20 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 13:57:48 2019 +0200

    Using the m_FeedbackFDs is now necessary also on iOS
    
    Until recently we had managed without them on iOS, but that changed
    with the recent "Unipoll" work, I think. (Without this change, the iOS
    app now runs into assertion failures early on. But note that this
    change is not enough to make it work fully again.)
    
    Change-Id: I09d25326ba73ce897da5c91f30530f5b3d5fd272
    Reviewed-on: https://gerrit.libreoffice.org/79210
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 48c7b46b4fd6..b3b082af98b3 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -76,9 +76,7 @@ SvpSalInstance::SvpSalInstance( std::unique_ptr<SalYieldMutex> pMutex )
     m_nTimeoutMS            = 0;
 
     m_MainThread = osl::Thread::getCurrentIdentifier();
-#ifndef IOS
     CreateWakeupPipe(true);
-#endif
     if( s_pDefaultInstance == nullptr )
         s_pDefaultInstance = this;
 #if !defined(ANDROID) && !defined(IOS)
@@ -90,13 +88,9 @@ SvpSalInstance::~SvpSalInstance()
 {
     if( s_pDefaultInstance == this )
         s_pDefaultInstance = nullptr;
-#ifndef IOS
     CloseWakeupPipe(true);
-#endif
 }
 
-#ifndef IOS
-
 void SvpSalInstance::CloseWakeupPipe(bool log)
 {
     SvpSalYieldMutex *const pMutex(dynamic_cast<SvpSalYieldMutex*>(GetYieldMutex()));
@@ -152,8 +146,6 @@ void SvpSalInstance::CreateWakeupPipe(bool log)
     }
 }
 
-#endif
-
 void SvpSalInstance::TriggerUserEventProcessing()
 {
     Wakeup();
@@ -342,11 +334,7 @@ void SvpSalYieldMutex::doAcquire(sal_uInt32 const nLockCount)
                 m_bNoYieldLock = true;
                 bool const bEvents = pInst->DoYield(false, request == SvpRequest::MainThreadDispatchAllEvents);
                 m_bNoYieldLock = false;
-#ifdef IOS
-                (void)bEvents;
-#else
                 write(m_FeedbackFDs[1], &bEvents, sizeof(bool));
-#endif
             }
         }
         while (true);
@@ -506,11 +494,9 @@ bool SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents)
                 : SvpRequest::MainThreadDispatchOneEvent);
 
         bool bDidWork(false);
-#ifndef IOS
         // blocking read (for synchronisation)
         auto const nRet = read(pMutex->m_FeedbackFDs[0], &bDidWork, sizeof(bool));
         assert(nRet == 1); (void) nRet;
-#endif
         if (!bDidWork && bWait)
         {
             // block & release YieldMutex until the main thread does something