strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "loolwsd: we use callbacks latch for not missing messages sent very early"

Browse source 
This reverts commit ed983f17cb.

Conflicts:
	loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h

Change-Id: Ia85b4d9223e9918dd33a66b8d6aeb0c3a1516a3c
Reviewed-on: https://gerrit.libreoffice.org/28904
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Marco Cecchetti 2016-09-14 11:08:20 +02:00 committed by Ashod Nakashian
parent 27bed804d5
commit 80153826db
4 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
loolwsd/ChildSession.cpp
View file

@ -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;

1
loolwsd/LOOLKit.cpp
View file

@ -1170,7 +1170,6 @@ private:
_viewIdToCallbackDescr.emplace(viewId,
std::unique_ptr<CallbackDescriptor>(new CallbackDescriptor({ this, viewId })));
_loKitDocument->registerCallback(ViewCallback, _viewIdToCallbackDescr[viewId].get());
_loKitDocument->setCallbackLatch(true);
Log::info() << "Document [" << _url << "] view ["
<< viewId << "] loaded, leaving "

11
loolwsd/LibreOfficeKit.hpp
View file

@ -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
};

4
loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
View file

@ -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
};