[core] Create glyph manager at renderer construction time

Avoid unnecessary glyph manager presence check in `Renderer::Impl::()`.
This commit is contained in:
Mikhail Pozdnyakov
2019-05-10 22:42:48 +03:00
parent 81823e35a6
commit 953ee5e81b
12 changed files with 31 additions and 32 deletions

View File

@@ -68,7 +68,7 @@ public:
StubFileSource fileSource;
StubGlyphManagerObserver observer;
StubGlyphRequestor requestor;
GlyphManager glyphManager{ fileSource, std::make_unique<StubLocalGlyphRasterizer>() };
GlyphManager glyphManager{ std::make_unique<StubLocalGlyphRasterizer>() };
void run(const std::string& url, GlyphDependencies dependencies) {
// Squelch logging.
@@ -76,7 +76,7 @@ public:
glyphManager.setURL(url);
glyphManager.setObserver(&observer);
glyphManager.getGlyphs(requestor, std::move(dependencies));
glyphManager.getGlyphs(requestor, std::move(dependencies), fileSource);
loop.run();
}
@@ -298,7 +298,7 @@ TEST(GlyphManager, ImmediateFileSource) {
StubFileSource fileSource = { StubFileSource::ResponseType::Synchronous };
StubGlyphManagerObserver observer;
StubGlyphRequestor requestor;
GlyphManager glyphManager { fileSource };
GlyphManager glyphManager;
void run(const std::string& url, GlyphDependencies dependencies) {
// Squelch logging.
@@ -306,7 +306,7 @@ TEST(GlyphManager, ImmediateFileSource) {
glyphManager.setURL(url);
glyphManager.setObserver(&observer);
glyphManager.getGlyphs(requestor, std::move(dependencies));
glyphManager.getGlyphs(requestor, std::move(dependencies), fileSource);
loop.run();
}