Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Update glyph requestors _before_ requesting from file source #10153

Merged
merged 2 commits into from
Oct 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/mbgl/text/glyph_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ void GlyphManager::getGlyphs(GlyphRequestor& requestor, GlyphDependencies glyphD
for (const auto& range : ranges) {
auto it = entry.ranges.find(range);
if (it == entry.ranges.end() || !it->second.parsed) {
GlyphRequest& request = requestRange(entry, fontStack, range);
GlyphRequest& request = entry.ranges[range];
request.requestors[&requestor] = dependencies;
requestRange(request, fontStack, range);
}
}
}
Expand All @@ -49,18 +50,14 @@ void GlyphManager::getGlyphs(GlyphRequestor& requestor, GlyphDependencies glyphD
}
}

GlyphManager::GlyphRequest& GlyphManager::requestRange(Entry& entry, const FontStack& fontStack, const GlyphRange& range) {
GlyphRequest& request = entry.ranges[range];

void GlyphManager::requestRange(GlyphRequest& request, const FontStack& fontStack, const GlyphRange& range) {
if (request.req) {
return request;
return;
}

request.req = fileSource.request(Resource::glyphs(glyphURL, fontStack, range), [this, fontStack, range](Response res) {
processResponse(res, fontStack, range);
});

return request;
}

void GlyphManager::processResponse(const Response& res, const FontStack& fontStack, const GlyphRange& range) {
Expand Down
2 changes: 1 addition & 1 deletion src/mbgl/text/glyph_manager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class GlyphManager : public util::noncopyable {

std::unordered_map<FontStack, Entry, FontStackHash> entries;

GlyphRequest& requestRange(Entry&, const FontStack&, const GlyphRange&);
void requestRange(GlyphRequest&, const FontStack&, const GlyphRange&);
void processResponse(const Response&, const FontStack&, const GlyphRange&);
void notify(GlyphRequestor&, const GlyphDependencies&);

Expand Down
16 changes: 14 additions & 2 deletions test/src/mbgl/test/stub_file_source.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ class StubFileRequest : public AsyncRequest {
StubFileSource& fileSource;
};

StubFileSource::StubFileSource() {
StubFileSource::StubFileSource(ResponseType type_)
: type(type_) {
if (type == ResponseType::Synchronous) {
return;
}

timer.start(1ms, 1ms, [this] {
// Explicit copy to avoid iterator invalidation if ~StubFileRequest gets called within the loop.
auto pending_ = pending;
Expand Down Expand Up @@ -46,7 +51,14 @@ StubFileSource::~StubFileSource() = default;

std::unique_ptr<AsyncRequest> StubFileSource::request(const Resource& resource, Callback callback) {
auto req = std::make_unique<StubFileRequest>(*this);
pending.emplace(req.get(), std::make_tuple(resource, response, callback));
if (type == ResponseType::Synchronous) {
optional<Response> res = response(resource);
if (res) {
callback(*res);
}
} else {
pending.emplace(req.get(), std::make_tuple(resource, response, callback));
}
return std::move(req);
}

Expand Down
8 changes: 7 additions & 1 deletion test/src/mbgl/test/stub_file_source.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ namespace mbgl {

class StubFileSource : public FileSource {
public:
StubFileSource();
enum class ResponseType {
Asynchronous = 0,
Synchronous
};

StubFileSource(ResponseType = ResponseType::Asynchronous);
~StubFileSource() override;

std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override;
Expand All @@ -36,6 +41,7 @@ class StubFileSource : public FileSource {
optional<Response> defaultResponse(const Resource&);

std::unordered_map<AsyncRequest*, std::tuple<Resource, ResponseFunction, Callback>> pending;
ResponseType type;
util::Timer timer;
};

Expand Down
49 changes: 49 additions & 0 deletions test/text/glyph_loader.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,52 @@ TEST(GlyphManager, LoadingInvalid) {
{{{"Test Stack"}}, {u'A', u'E'}}
});
}

TEST(GlyphManager, ImmediateFileSource) {
class GlyphManagerTestSynchronous {
public:
util::RunLoop loop;
StubFileSource fileSource = { StubFileSource::ResponseType::Synchronous };
StubGlyphManagerObserver observer;
StubGlyphRequestor requestor;
GlyphManager glyphManager { fileSource };

void run(const std::string& url, GlyphDependencies dependencies) {
// Squelch logging.
Log::setObserver(std::make_unique<Log::NullObserver>());

glyphManager.setURL(url);
glyphManager.setObserver(&observer);
glyphManager.getGlyphs(requestor, std::move(dependencies));

loop.run();
}

void end() {
loop.stop();
}
};

GlyphManagerTestSynchronous test;

test.fileSource.glyphsResponse = [&] (const Resource&) {
Response response;
response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
return response;
};

test.observer.glyphsError = [&] (const FontStack&, const GlyphRange&, std::exception_ptr) {
FAIL();
test.end();
};

test.requestor.glyphsAvailable = [&] (GlyphMap) {
test.end();
};

test.run(
"test/fixtures/resources/glyphs.pbf",
GlyphDependencies {
{{{"Test Stack"}}, {u'a', u'å', u' '}}
});
}