loolwsd/DocumentBroker.cpp | 8 ++------
loolwsd/TileCache.cpp | 14 +++++---------
loolwsd/TileCache.hpp | 2 +-
loolwsd/test/TileCacheTests.cpp | 2 +-
4 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit ec4b4898859f2849ba7888b04dc688f804cb6975
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Sep 19 20:21:18 2016 -0400
loolwsd: remove unused priority flag from saveTileAndNotify
Change-Id: I49309bb80a6b9e9e8265da8f8db966b98e362f0a
Reviewed-on: https://gerrit.libreoffice.org/29068
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 78cc9e7..5ef3f60 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -609,13 +609,9 @@ void DocumentBroker::handleTileResponse(const
std::vector<char>& payload)
if (firstLine.size() < static_cast<std::string::size_type>(length) - 1)
{
- // If the tile right under the cursor, give it priority.
- const bool priority = tile.intersectsWithRect(
- _cursorPosX, _cursorPosY,
- _cursorWidth, _cursorHeight);
tileCache().saveTileAndNotify(
tile, buffer + firstLine.size() + 1,
- length - firstLine.size() - 1, priority);
+ length - firstLine.size() - 1);
}
else
{
@@ -648,7 +644,7 @@ void DocumentBroker::handleTileCombinedResponse(const
std::vector<char>& payload
{
for (const auto& tile : tileCombined.getTiles())
{
- tileCache().saveTileAndNotify(tile, buffer + offset,
tile.getImgSize(), false);
+ tileCache().saveTileAndNotify(tile, buffer + offset,
tile.getImgSize());
offset += tile.getImgSize();
}
}
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 9e3bca7..c7dfd6e 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -140,19 +140,11 @@ std::unique_ptr<std::fstream> TileCache::lookupTile(const
TileDesc& tile)
return nullptr;
}
-void TileCache::saveTileAndNotify(const TileDesc& tile, const char *data,
const size_t size, const bool /* priority */)
+void TileCache::saveTileAndNotify(const TileDesc& tile, const char *data,
const size_t size)
{
std::unique_lock<std::mutex> lock(_tilesBeingRenderedMutex);
std::shared_ptr<TileBeingRendered> tileBeingRendered =
findTileBeingRendered(tile);
-#if 0
- if (!priority && tileBeingRendered && tileBeingRendered->getVersion() !=
tile.getVersion())
- {
- Log::trace() << "Skipping unexpected tile ver: " << tile.getVersion()
- << ", waiting for ver " <<
tileBeingRendered->getVersion() << Log::end;
- return;
- }
-#endif
// Save to disk.
const auto cachedName = (tileBeingRendered ?
tileBeingRendered->getCacheName()
@@ -197,6 +189,10 @@ void TileCache::saveTileAndNotify(const TileDesc& tile,
const char *data, const
}
}
}
+ else
+ {
+ Log::debug("No subscribers for: " + cachedName);
+ }
// Remove subscriptions.
if (tileBeingRendered->getVersion() == tile.getVersion())
diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp
index bbe5aa0..08b14e0 100644
--- a/loolwsd/TileCache.hpp
+++ b/loolwsd/TileCache.hpp
@@ -44,7 +44,7 @@ public:
std::unique_ptr<std::fstream> lookupTile(const TileDesc& tile);
- void saveTileAndNotify(const TileDesc& tile, const char *data, const
size_t size, const bool priority);
+ void saveTileAndNotify(const TileDesc& tile, const char *data, const
size_t size);
std::string getTextFile(const std::string& fileName);
diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index a4d3527..b9f8900 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -159,7 +159,7 @@ void TileCacheTests::testSimple()
// Cache Tile
const auto size = 1024;
const auto data = genRandomData(size);
- tc.saveTileAndNotify(tile, data.data(), size, true);
+ tc.saveTileAndNotify(tile, data.data(), size);
// Find Tile
file = tc.lookupTile(tile);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
