loolwsd/ClientSession.cpp | 2 +-
loolwsd/TileCache.cpp | 2 +-
loolwsd/TileCache.hpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cdf6beee864843078b66806200f7e45c2fdd9aa9
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Oct 24 08:54:37 2016 -0400
loolwsd: lookupRendering -> lookupCachedFile
Change-Id: I668e1e11aaf9a88b40084ac23bcd574cf258262f
Reviewed-on: https://gerrit.libreoffice.org/30244
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index ee5510b..2faf494 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 f3cb817..5decc9e 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 fc0210b..fd44cd0 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
