wsd/ClientSession.cpp | 10 +++++----- wsd/DocumentBroker.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 6d3a0d03272b9a01fb50254dd2acd67afc6e9ac0 Author: Tamás Zolnai <[email protected]> AuthorDate: Fri Aug 10 17:48:59 2018 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Fri Aug 10 17:49:48 2018 +0200 Update row by row, instead of column by column Change-Id: I504cab9509d25eebf3f68c63dd7e18a54f80d865 diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index 3e353e502..b11331dc8 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -1202,13 +1202,13 @@ void ClientSession::handleTileInvalidation(const std::string& message, intersection._y2 = std::min(invalidateRect._y2, _clientVisibleArea._y2); if(intersection.isValid()) // Client visible area and invalidated rectangle has intersection { - for(int i = std::ceil(intersection._x1 / _tileWidthTwips); - i <= std::ceil(intersection._x2 / _tileWidthTwips); ++i) + for(int i = std::ceil(intersection._y1 / _tileHeightTwips); + i <= std::ceil(intersection._y2 / _tileHeightTwips); ++i) { - for(int j = std::ceil(intersection._y1 / _tileHeightTwips); - j <= std::ceil(intersection._y2 / _tileHeightTwips); ++j) + for(int j = std::ceil(intersection._x1 / _tileWidthTwips); + j <= std::ceil(intersection._x2 / _tileWidthTwips); ++j) { - invalidTiles.emplace_back(TileDesc(part, _tileWidthPixel, _tileHeightPixel, i * _tileWidthTwips, j * _tileHeightTwips, _tileWidthTwips, _tileHeightTwips, -1, 0, -1, false)); + invalidTiles.emplace_back(TileDesc(part, _tileWidthPixel, _tileHeightPixel, j * _tileWidthTwips, i * _tileHeightTwips, _tileWidthTwips, _tileHeightTwips, -1, 0, -1, false)); TileWireId oldWireId = 0; auto iter = _oldWireIds.find(generateTileID(invalidTiles.back())); commit 3bc8821bb0c7fcd887376367519fa8623a09962a Author: Tamás Zolnai <[email protected]> AuthorDate: Fri Aug 10 17:22:14 2018 +0200 Commit: Tamás Zolnai <[email protected]> CommitDate: Fri Aug 10 17:49:48 2018 +0200 Enough to have smaller tiles-on-fly limit Change-Id: I7e9e1b2c117cb8938b6f0fb2eac8ab3e2c8fef30 diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 2a307f3f7..be5c3aae4 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -1374,7 +1374,7 @@ void DocumentBroker::sendRequestedTiles(const std::shared_ptr<ClientSession>& se static_cast<float>(session->getTileHeightInTwips()); const float tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight; - const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, tilesInVisArea * 1.5f); + const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, tilesInVisArea * 1.20f); // Update client's tilesBeingRendered list session->removeOutdatedTileSubscriptions(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
