[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - 2 commits - common/MessageQueue.cpp kit/Kit.cpp

[Jan Holesovsky]

 common/MessageQueue.cpp |    1 +
 kit/Kit.cpp             |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit fb41f4df63dda36f3a8beb056223d2dddc0b60c9
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 7 11:27:21 2017 +0200

    Don't bloat the message queue with unprocessed status indicator changes.
    
    Change-Id: I87f254a94183b5a97cfb1e4eb49ddea7f88258bf

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index f293fe49..acff9b88 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -340,6 +340,7 @@ std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
     }
     else if (callbackType == "1" || // the cursor has moved
             callbackType == "5" ||  // the cursor visibility has changed
+            callbackType == "10" || // setting the indicator value
             callbackType == "17" || // the cell cursor has moved
             callbackType == "24" || // the view cursor has moved
             callbackType == "26" || // the view cell cursor has moved
commit 9b09da8403b6fa763bb395a28a0780988badb7c3
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Apr 7 11:20:48 2017 +0200

    More logging of the rendering time.
    
    Change-Id: Iecaab7150b0f9751c2d53813e29d5ca115115980

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index d770a9bc..242dc575 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -716,7 +716,7 @@ public:
                                       pixmapWidth, pixmapHeight,
                                       renderArea.getLeft(), renderArea.getTop(),
                                       renderArea.getWidth(), renderArea.getHeight());
-        const auto elapsed = timestamp.elapsed();
+        Timestamp::TimeDiff elapsed = timestamp.elapsed();
         LOG_DBG("paintTile (combined) at (" << renderArea.getLeft() << ", " << renderArea.getTop() << "), (" <<
                 renderArea.getWidth() << ", " << renderArea.getHeight() << ") " <<
                 " rendered in " << (elapsed/1000.) << " ms (" << area / elapsed << " MP/s).");
@@ -764,6 +764,11 @@ public:
             tileIndex++;
         }
 
+        elapsed = timestamp.elapsed();
+        LOG_DBG("renderCombinedTiles at (" << renderArea.getLeft() << ", " << renderArea.getTop() << "), (" <<
+                renderArea.getWidth() << ", " << renderArea.getHeight() << ") " <<
+                " took " << (elapsed/1000.) << " ms (including the paintTile).");
+
 #if ENABLE_DEBUG
         const auto tileMsg = tileCombined.serialize("tilecombine:") + " renderid=" + Util::UniqueId() + "\n";
 #else