loolwsd/TileCache.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
New commits: commit e311e26641df25451ac058059a17a7f135c52ee6 Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> Date: Sun May 1 09:30:31 2016 -0400 loolwsd: private better than public Change-Id: Ie4e9abf160a0a9d9c7de8e31358468ce154a30cd Reviewed-on: https://gerrit.libreoffice.org/24568 Reviewed-by: Ashod Nakashian <ashnak...@gmail.com> Tested-by: Ashod Nakashian <ashnak...@gmail.com> diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp index 7919a47..1d523db 100644 --- a/loolwsd/TileCache.hpp +++ b/loolwsd/TileCache.hpp @@ -27,8 +27,7 @@ class TileCache { struct TileBeingRendered; - std::shared_ptr<TileBeingRendered> findTileBeingRendered(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight) -; + std::shared_ptr<TileBeingRendered> findTileBeingRendered(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight); public: /// When the docURL is a non-file:// url, the timestamp has to be provided by the caller. @@ -41,8 +40,6 @@ public: bool isTileBeingRenderedIfSoSubscribe(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight, const std::shared_ptr<MasterProcessSession> &subscriber); - void forgetTileBeingRendered(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight); - std::unique_ptr<std::fstream> lookupTile(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight); void saveTile(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight, const char *data, size_t size); @@ -66,21 +63,23 @@ public: // The tiles parameter is an invalidatetiles: message as sent by the child process void invalidateTiles(const std::string& tiles); + /// Store the timestamp to modtime.txt. + void saveLastModified(const Poco::Timestamp& timestamp); + +private: void invalidateTiles(int part, int x, int y, int width, int height); // Removes the given file from the cache void removeFile(const std::string& fileName); - /// Store the timestamp to modtime.txt. - void saveLastModified(const Poco::Timestamp& timestamp); - -private: std::string cacheFileName(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight); bool parseCacheFileName(const std::string& fileName, int& part, int& width, int& height, int& tilePosX, int& tilePosY, int& tileWidth, int& tileHeight); /// Extract location from fileName, and check if it intersects with [x, y, width, height]. bool intersectsTile(const std::string& fileName, int part, int x, int y, int width, int height); + void forgetTileBeingRendered(int part, int width, int height, int tilePosX, int tilePosY, int tileWidth, int tileHeight); + /// Load the timestamp from modtime.txt. Poco::Timestamp getLastModified(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits