diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-10-24 08:54:37 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-10-25 15:00:02 +0200 |
| commit | cd47726bfac7f05ef7aa9a929ad9a156ad3086f5 (patch) | |
| tree | 87bdde8fbd8da61c04b72237b17dab157372b93e | |
| parent | 79d3fbac258e624b7b93ea227f390945b89c9de6 (diff) | |
loolwsd: lookupRendering -> lookupCachedFile
Change-Id: I668e1e11aaf9a88b40084ac23bcd574cf258262f
Reviewed-on: https://gerrit.libreoffice.org/30244
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit cdf6beee864843078b66806200f7e45c2fdd9aa9)
| -rw-r--r-- | loolwsd/ClientSession.cpp | 2 | ||||
| -rw-r--r-- | loolwsd/TileCache.cpp | 2 | ||||
| -rw-r--r-- | loolwsd/TileCache.hpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp index ee5510b4d..2faf49448 100644 --- a/loolwsd/ClientSession.cpp +++ b/loolwsd/ClientSession.cpp @@ -300,7 +300,7 @@ bool ClientSession::sendFontRendering(const char *buffer, int length, StringToke output.resize(response.size()); std::memcpy(output.data(), response.data(), response.size()); - std::unique_ptr<std::fstream> cachedRendering = docBroker->tileCache().lookupRendering(font, "font"); + std::unique_ptr<std::fstream> cachedRendering = docBroker->tileCache().lookupCachedFile(font, "font"); if (cachedRendering && cachedRendering->is_open()) { cachedRendering->seekg(0, std::ios_base::end); diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp index f3cb81714..5decc9e86 100644 --- a/loolwsd/TileCache.cpp +++ b/loolwsd/TileCache.cpp @@ -280,7 +280,7 @@ void TileCache::saveRendering(const std::string& name, const std::string& dir, c Util::saveDataToFileSafely(fileName, data, size); } -std::unique_ptr<std::fstream> TileCache::lookupRendering(const std::string& name, const std::string& dir) +std::unique_ptr<std::fstream> TileCache::lookupCachedFile(const std::string& name, const std::string& dir) { const std::string dirName = _cacheDir + "/" + dir; const std::string fileName = dirName + "/" + name; diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp index fc0210b09..fd44cd0c6 100644 --- a/loolwsd/TileCache.hpp +++ b/loolwsd/TileCache.hpp @@ -61,7 +61,7 @@ public: // The dir parameter should be the type of rendering, like "font", "style", etc void saveRendering(const std::string& name, const std::string& dir, const char *data, size_t size); - std::unique_ptr<std::fstream> lookupRendering(const std::string& name, const std::string& dir); + std::unique_ptr<std::fstream> lookupCachedFile(const std::string& name, const std::string& dir); // The tiles parameter is an invalidatetiles: message as sent by the child process void invalidateTiles(const std::string& tiles); |