loolwsd/DocumentBroker.cpp | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)
New commits: commit 1255cc11d894685362249d48063f000e75adc0d3 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Mon Sep 19 20:29:40 2016 -0400 loolwsd: version each tile and simplify tilecombine request handling Change-Id: I369b05a747182cb387141d09ecb5098e1dd16901 Reviewed-on: https://gerrit.libreoffice.org/29065 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 709c2a0..1e58e76 100644 --- a/loolwsd/DocumentBroker.cpp +++ b/loolwsd/DocumentBroker.cpp @@ -545,11 +545,9 @@ void DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined, { std::unique_lock<std::mutex> lock(_mutex); - tileCombined.setVersion(++_tileVersion); Log::trace() << "TileCombined request for " << tileCombined.serialize() << Log::end; // Satisfy as many tiles from the cache. - std::vector<TileDesc> tiles; for (auto& tile : tileCombined.getTiles()) { std::unique_ptr<std::fstream> cachedTile = _tileCache->lookupTile(tile); @@ -577,12 +575,11 @@ void DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined, cachedTile->close(); session->sendBinaryFrame(output.data(), output.size()); - continue; } else { // Not cached, needs rendering. - tile.setVersion(_tileVersion); + tile.setVersion(++_tileVersion); const auto ver = tileCache().subscribeToTileRendering(tile, session); if (ver <= 0) { @@ -590,29 +587,12 @@ void DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined, continue; } else - if (tile.intersectsWithRect(_cursorPosX, _cursorPosY, - _cursorWidth, _cursorHeight)) { - // If this tile is right under the cursor, give it priority. const auto req = tile.serialize("tile"); - Log::debug() << "Priority tile request: " << req << Log::end; + Log::debug() << "Tile request: " << req << Log::end; _childProcess->getWebSocket()->sendFrame(req.data(), req.size()); - - // No need to process with the group anymore. - continue; } } - - tiles.push_back(tile); - } - - for (auto& tile : tiles) - { - const auto tileMsg = tile.serialize("tile "); - Log::debug() << "TileCombined residual request for " << tileMsg << Log::end; - - // Forward to child to render. - _childProcess->getWebSocket()->sendFrame(tileMsg.data(), tileMsg.size()); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits