From 80153826db9c299ad8124084cf570ac291129a57 Mon Sep 17 00:00:00 2001 From: Marco Cecchetti Date: Wed, 14 Sep 2016 11:08:20 +0200 Subject: [PATCH] Revert "loolwsd: we use callbacks latch for not missing messages sent very early" This reverts commit ed983f17cbf2627ff7b1b1a04af03449bd18ff6b. Conflicts: loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h Change-Id: Ia85b4d9223e9918dd33a66b8d6aeb0c3a1516a3c Reviewed-on: https://gerrit.libreoffice.org/28904 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian --- loolwsd/ChildSession.cpp | 1 - loolwsd/LOOLKit.cpp | 1 - loolwsd/LibreOfficeKit.hpp | 11 ----------- .../bundled/include/LibreOfficeKit/LibreOfficeKit.h | 4 ---- 4 files changed, 17 deletions(-) diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp index 9c3e3dc2f..93a231232 100644 --- a/loolwsd/ChildSession.cpp +++ b/loolwsd/ChildSession.cpp @@ -356,7 +356,6 @@ bool ChildSession::loadDocument(const char * /*buffer*/, int /*length*/, StringT // Inform this view of other views _docManager.notifyCurrentViewOfOtherViews(getId()); - _loKitDocument->setCallbackLatch(false); Log::info("Loaded session " + getId()); return true; diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 583b173f9..6f0f4c4b5 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -1170,7 +1170,6 @@ private: _viewIdToCallbackDescr.emplace(viewId, std::unique_ptr(new CallbackDescriptor({ this, viewId }))); _loKitDocument->registerCallback(ViewCallback, _viewIdToCallbackDescr[viewId].get()); - _loKitDocument->setCallbackLatch(true); Log::info() << "Document [" << _url << "] view [" << viewId << "] loaded, leaving " diff --git a/loolwsd/LibreOfficeKit.hpp b/loolwsd/LibreOfficeKit.hpp index d718eddd9..5881c772b 100644 --- a/loolwsd/LibreOfficeKit.hpp +++ b/loolwsd/LibreOfficeKit.hpp @@ -464,17 +464,6 @@ public: nTileWidth, nTileHeight); } - /** - * Enable/disable callbacks latch. LOK will set the latch when it wants to - * queue new callbacks but not flush them. - * - * @param bCallbackLatch: true enables the latch, false disables it. - */ - inline void setCallbackLatch(bool bCallbackLatch) - { - _pDoc->pClass->setCallbackLatch(_pDoc, bCallbackLatch); - } - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 53162a35e..81d65c1ac 100644 --- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -244,10 +244,6 @@ struct _LibreOfficeKitDocumentClass const int nTileWidth, const int nTileHeight); - /// @see lok::Document::setCallbackLatch(). - void (*setCallbackLatch) (LibreOfficeKitDocument* pThis, - bool bCallbackLatch); - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY };