[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp

[Ashod Nakashian]

 loolwsd/LOOLKit.cpp |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 82333e06faea26bc019cdd8ea967bc8846650df6
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed May 4 06:55:56 2016 -0400

    loolwsd: add explanation as to why code is commented out
    
    Change-Id: I3478d6c84cd960c4a7317ee5adc75db8c13aeaef
    Reviewed-on: https://gerrit.libreoffice.org/24647
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 2262e78..93b4a98 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -661,8 +661,14 @@ public:
         ws->sendFrame(output.data(), length, WebSocket::FRAME_BINARY);
     }
 
-    void sendCombinedTiles(const char* /*buffer*/, int /*length*/, StringTokenizer& tokens)
+    void sendCombinedTiles(const char* /*buffer*/, int /*length*/, StringTokenizer& /*tokens*/)
     {
+        // This is unnecessary at this point, since the DocumentBroker will send us individual
+        // tile requests (i.e. it breaks tilecombine requests).
+        // So unless DocumentBroker combines them again, there is no point in having this here.
+        // In fact, we probably want to remove this, since we always want to render individual
+        // tiles so that we can fetch them separately in the future.
+#if 0
         int part, pixelWidth, pixelHeight, tileWidth, tileHeight;
         std::string tilePositionsX, tilePositionsY;
         std::string reqTimestamp;
@@ -690,7 +696,7 @@ public:
 
         if (tokens.count() > 8)
             getTokenString(tokens[8], "timestamp", reqTimestamp);
-/*
+
         bool makeSlow = delayAndRewritePart(part);
 
         Util::Rectangle renderArea;
@@ -804,7 +810,7 @@ public:
 
         if (makeSlow)
             delay();
-        */
+#endif
     }
 
 private: