[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/SenderQueue.hpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp  |    5 -----
 wsd/ClientSession.hpp  |    2 --
 wsd/DocumentBroker.cpp |    1 -
 wsd/SenderQueue.hpp    |    9 ---------
 4 files changed, 17 deletions(-)

New commits:
commit 7d98b5f01567af9625eaacbf25da671362a27c56
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Aug 20 15:03:57 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Aug 20 15:13:59 2018 +0200

    Revert "Get back "Cancel tiles also in wsd's senderqueue""
    
    This reverts commit f1a385be98aba7191de79606d1cfdfa6973dfc39.
    
    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 at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 3f27a435c..90e099d38 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -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())
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 4037d81a2..997058f68 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -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)
     {
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index cf5c8eb84..be5c3aae4 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -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();
 
diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index 927e3e735..fc3464b3f 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -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