Revert "Get back "Cancel tiles also in wsd's senderqueue""
This reverts commit f1a385be98
.
It's not easy, it can interfere the tile tracking.
Change-Id: I1e4ec9b4d66e5e912873f673fd5cb71ba55a9332
Reviewed-on: https://gerrit.libreoffice.org/59326
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
This commit is contained in:
parent
db5a57308b
commit
7d98b5f015
4 changed files with 0 additions and 17 deletions
|
@ -1001,11 +1001,6 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
|
|||
return forwardToClient(payload);
|
||||
}
|
||||
|
||||
void ClientSession::cancelTilesInQueue()
|
||||
{
|
||||
_senderQueue.cancelTiles();
|
||||
}
|
||||
|
||||
bool ClientSession::forwardToClient(const std::shared_ptr<Message>& payload)
|
||||
{
|
||||
if (isCloseFrame())
|
||||
|
|
|
@ -99,8 +99,6 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void cancelTilesInQueue();
|
||||
|
||||
/// Set the save-as socket which is used to send convert-to results.
|
||||
void setSaveAsSocket(const std::shared_ptr<StreamSocket>& socket)
|
||||
{
|
||||
|
|
|
@ -1448,7 +1448,6 @@ void DocumentBroker::cancelTileRequests(const std::shared_ptr<ClientSession>& se
|
|||
// Clear tile requests
|
||||
session->clearTilesOnFly();
|
||||
session->getRequestedTiles() = boost::none;
|
||||
session->cancelTilesInQueue();
|
||||
|
||||
session->clearTileSubscription();
|
||||
|
||||
|
|
|
@ -84,15 +84,6 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void cancelTiles()
|
||||
{
|
||||
std::remove_if(_queue.begin(), _queue.end(),
|
||||
[](const queue_item_t& cur)
|
||||
{
|
||||
return cur->firstToken() == "tile:";
|
||||
});
|
||||
}
|
||||
|
||||
private:
|
||||
/// Deduplicate messages based on the new one.
|
||||
/// Returns true if the new message should be
|
||||
|
|
Loading…
Reference in a new issue