summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/render_style.cpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-08-01 11:29:16 +0200
committerKonstantin Käfer <mail@kkaefer.com>2017-08-01 11:29:16 +0200
commit995aa163234be3cb40c81b307bc4f47b990a35e3 (patch)
tree658f8b707641b23837c10c7145ba41205377f3e6 /src/mbgl/renderer/render_style.cpp
parent54ca0c357bf522cb01fa3ee2f1131aac9b9c0cc0 (diff)
downloadqtlocation-mapboxgl-upstream/make-stale-resources-renderable.tar.gz
Diffstat (limited to 'src/mbgl/renderer/render_style.cpp')
-rw-r--r--src/mbgl/renderer/render_style.cpp25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/mbgl/renderer/render_style.cpp b/src/mbgl/renderer/render_style.cpp
index 3d95b12bc4..f84e6987aa 100644
--- a/src/mbgl/renderer/render_style.cpp
+++ b/src/mbgl/renderer/render_style.cpp
@@ -422,16 +422,25 @@ void RenderStyle::onLowMemory() {
}
}
-void RenderStyle::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) {
- Log::Error(Event::Style, "Failed to load glyph range %d-%d for font stack %s: %s",
- glyphRange.first, glyphRange.second, fontStackToString(fontStack).c_str(), util::toString(error).c_str());
- observer->onResourceError(error);
+void RenderStyle::onGlyphsError(const FontStack& fontStack,
+ const GlyphRange& glyphRange,
+ std::exception_ptr error,
+ const EventSeverity severity) {
+ Log::Record(severity, Event::Style, "Failed to load glyph range %d-%d for font stack %s: %s",
+ glyphRange.first, glyphRange.second, fontStackToString(fontStack).c_str(),
+ util::toString(error).c_str());
+ observer->onResourceError(error, severity);
}
-void RenderStyle::onTileError(RenderSource& source, const OverscaledTileID& tileID, std::exception_ptr error) {
- Log::Error(Event::Style, "Failed to load tile %s for source %s: %s",
- util::toString(tileID).c_str(), source.baseImpl->id.c_str(), util::toString(error).c_str());
- observer->onResourceError(error);
+void RenderStyle::onTileError(RenderSource& source,
+ const OverscaledTileID& tileID,
+ std::exception_ptr error,
+ const EventSeverity severity) {
+ Log::Record(severity, Event::Style, "Failed to load tile %s for source %s: %s",
+ util::toString(tileID).c_str(), source.baseImpl->id.c_str(),
+ util::toString(error).c_str());
+ observer->onResourceError(error, severity);
+ observer->onInvalidate();
}
void RenderStyle::onTileChanged(RenderSource&, const OverscaledTileID&) {