[Libreoffice-commits] online.git: 2 commits - wsd/ClientSession.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1a885b9c40449a5d491684c7d66674554deed351
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Aug 6 16:58:19 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Aug 7 16:22:48 2018 +0200

    Store wireId only for tiles inside the visible area
    
    Change-Id: If60015c86bbdd1158c203a7a9c47b3dc877ac6c5

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index b3f6083dd..3e353e502 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1246,7 +1246,13 @@ void ClientSession::traceTileBySend(const TileDesc& tile)
     }
     else
     {
-        _oldWireIds.insert(std::pair<std::string, TileWireId>(tileID, tile.getWireId()));
+        // Track only tile inside the visible area
+        if(_clientVisibleArea.hasSurface() &&
+           tile.getTilePosX() >= _clientVisibleArea._x1 && tile.getTilePosX() <= _clientVisibleArea._x2 &&
+           tile.getTilePosY() >= _clientVisibleArea._y1 && tile.getTilePosY() <= _clientVisibleArea._y2)
+        {
+            _oldWireIds.insert(std::pair<std::string, TileWireId>(tileID, tile.getWireId()));
+        }
     }
 
     // Record that the tile is sent
commit e35ce41eaa0986ebc6ae497ee5883ede2566b58f
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Aug 6 14:17:45 2018 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Tue Aug 7 16:22:48 2018 +0200

    Need to reset wireId map anytime when part number changes
    
    Change-Id: I8309a0a0788587f6daebe9698723df6bc0410039

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 5b429c532..b3f6083dd 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -747,10 +747,12 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt
             if(getTokenInteger(tokens[1], "part", setPart))
             {
                 _clientSelectedPart = setPart;
+                resetWireIdMap();
             }
             else if (stringToInteger(tokens[1], setPart))
             {
                 _clientSelectedPart = setPart;
+                resetWireIdMap();
             }
             else
                 return false;