loolwsd/DocumentBroker.cpp | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
New commits:
commit c3ed8f708ccbbe1daa4b5d59ccd474a082bd516f
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Wed Sep 21 18:31:13 2016 -0400
loolwsd: always request new tile rendering
This is fine since there is deduplication logic
in the queue before rendering, so it's safer
to pass client requests along and rather than not.
Change-Id: I6d50fc731a273d907e178827a09e8cf9a4b8345b
Reviewed-on: https://gerrit.libreoffice.org/29163
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 289842c..9f630bf 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -558,18 +558,13 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
{
// Not cached, needs rendering.
tile.setVersion(++_tileVersion);
- const auto ver = tileCache().subscribeToTileRendering(tile,
session);
- if (ver <= 0)
- {
- // Already rendering. Skip.
- continue;
- }
- else
- {
- const auto req = tile.serialize("tile");
- Log::debug() << "Tile request: " << req << Log::end;
- _childProcess->getWebSocket()->sendFrame(req.data(),
req.size());
- }
+ tileCache().subscribeToTileRendering(tile, session);
+
+ // Forward to child to render.
+ Log::debug() << "Sending render request for tile (" <<
tile.getPart() << ',' << tile.getTilePosX() << ',' << tile.getTilePosY() <<
")." << Log::end;
+ const auto req = tile.serialize("tile");
+ Log::debug() << "Tile request: " << req << Log::end;
+ _childProcess->getWebSocket()->sendFrame(req.data(), req.size());
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
