diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-12 13:01:00 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-13 09:28:53 -0700 |
commit | b3ec985568176b077756b66754470988436d43c1 (patch) | |
tree | 45638ff9787938cd34240542e95e51509773edbf /src/mbgl/style/style.cpp | |
parent | 84e39611a096058826dbdb89dccbd1affad05f76 (diff) | |
download | qtlocation-mapboxgl-b3ec985568176b077756b66754470988436d43c1.tar.gz |
[core] Trim StyleObserver interface
It doesn't need to inherit from SpriteLoaderObserver and GlyphAtlasObserver.
Diffstat (limited to 'src/mbgl/style/style.cpp')
-rw-r--r-- | src/mbgl/style/style.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 5f67d495bd..ae9ed97427 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -729,15 +729,10 @@ void Style::setObserver(style::Observer* observer_) { observer = observer_; } -void Style::onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) { - observer->onGlyphsLoaded(fontStack, glyphRange); -} - void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) { lastError = 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->onGlyphsError(fontStack, glyphRange, error); observer->onResourceError(error); } @@ -789,14 +784,12 @@ void Style::onSpriteLoaded(SpriteLoader::Images&& images) { spriteAtlas->onSpriteLoaded(std::move(addedImages)); // Update observer - observer->onSpriteLoaded(std::move(images)); observer->onUpdate(Update::Repaint); // For *-pattern properties. } void Style::onSpriteError(std::exception_ptr error) { lastError = error; Log::Error(Event::Style, "Failed to load sprite: %s", util::toString(error).c_str()); - observer->onSpriteError(error); observer->onResourceError(error); } |