[Libreoffice-commits] online.git: loleaflet/src loolwsd/ChildProcessSession.cpp

[Ashod Nakashian]

 loleaflet/src/map/Map.js        |    4 ++++
 loolwsd/ChildProcessSession.cpp |   13 ++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 6789550cd97c55887b8b6d23ea172b6b1e049381
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Apr 22 17:45:44 2016 -0400

    No need to send invalidatetiles to the client on becoming active
    
    The invalidatetiles is normally a notification coming from
    LOK and it signifies that the tiles in quesion need
    rendering anew. Issuing this internally from the Kit
    removes TileCache images unnecessarily.
    
    Furthermore, since this message is always sent in response
    useractive message, there is no need in issuing it from
    WSD when loleaflet is perfectly capable of issuing it
    itself (internally).
    
    Change-Id: Ia97de6d803745dca3f6e73100f2d921dbbdf76f6
    Reviewed-on: https://gerrit.libreoffice.org/24316
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 14f5ced..266570f 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -9,6 +9,10 @@ function activate(map)
 		map._socket.sendMessage('useractive');
 	}
 
+	if (map._docLayer) {
+		map._docLayer._onMessage('invalidatetiles: part=0 x=0 y=0 width=2147483647 height=2147483647', null);
+	}
+
 	return vex.close(vex.globalID - 1);
 }
 
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index ec9448a..f7e74f7 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -334,19 +334,10 @@ bool ChildProcessSession::_handleInput(const char *buffer, int length)
         if (_multiView)
             _loKitDocument->pClass->setView(_loKitDocument, _viewId);
 
-        int curPart = _loKitDocument->pClass->getPart(_loKitDocument);
+        const int curPart = _loKitDocument->pClass->getPart(_loKitDocument);
         sendTextFrame("curpart: part=" + std::to_string(curPart));
-        if (getDocType() == "text")
-        {
-            curPart = 0;
-        }
-
-        sendTextFrame("invalidatetiles:"
-                       " part=" + std::to_string(curPart) +
-                       " x=0 y=0"
-                       " width=" + std::to_string(INT_MAX) +
-                       " height=" + std::to_string(INT_MAX));
 
+        //TODO: Is the order of these important?
         for (const auto& pair : _missedNotif)
         {
             switch (pair.first)