From 8a8f828e41c24afe4dc8df701f149c3d238c054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 27 May 2016 16:54:31 +0200 Subject: [PATCH] [core] rename onPlacementRedone -> onNeedsRepaint --- src/mbgl/map/map.cpp | 4 ++-- src/mbgl/style/observer.hpp | 6 +++--- src/mbgl/style/source.cpp | 4 ++-- src/mbgl/style/source.hpp | 2 +- src/mbgl/style/source_observer.hpp | 2 +- src/mbgl/style/style.cpp | 12 ++++++------ src/mbgl/style/style.hpp | 2 +- src/mbgl/tile/geometry_tile_data.cpp | 2 +- src/mbgl/tile/tile_data_observer.hpp | 2 +- test/src/mbgl/test/stub_style_observer.hpp | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index b08d3ef71..2b39b3e88 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -37,7 +37,7 @@ class Map::Impl : public style::Observer { public: Impl(View&, FileSource&, MapMode, GLContextMode, ConstrainMode, ViewportMode); - void onResourceLoaded() override; + void onNeedsRepaint() override; void onResourceError(std::exception_ptr) override; void update(); @@ -836,7 +836,7 @@ void Map::onLowMemory() { impl->view.invalidate(); } -void Map::Impl::onResourceLoaded() { +void Map::Impl::onNeedsRepaint() { updateFlags |= Update::Repaint; asyncUpdate.send(); } diff --git a/src/mbgl/style/observer.hpp b/src/mbgl/style/observer.hpp index c19f58904..4a5b5ab6c 100644 --- a/src/mbgl/style/observer.hpp +++ b/src/mbgl/style/observer.hpp @@ -15,10 +15,10 @@ public: * In addition to the individual glyph, sprite, and source events, the * following "rollup" events are provided for convenience. They are * strictly additive; e.g. when a source is loaded, both `onSourceLoaded` - * and `onResourceLoaded` will be called. + * and `onNeedsRepaint` will be called. */ - virtual void onResourceLoaded() {}; - virtual void onResourceError(std::exception_ptr) {}; + virtual void onNeedsRepaint() {} + virtual void onResourceError(std::exception_ptr) {} }; } // namespace style diff --git a/src/mbgl/style/source.cpp b/src/mbgl/style/source.cpp index 89701a2e8..c398fe845 100644 --- a/src/mbgl/style/source.cpp +++ b/src/mbgl/style/source.cpp @@ -418,8 +418,8 @@ void Source::onTileError(TileData& tileData, std::exception_ptr error) { observer->onTileError(*this, tileData.id, error); } -void Source::onPlacementRedone(TileData&) { - observer->onPlacementRedone(); +void Source::onNeedsRepaint() { + observer->onNeedsRepaint(); } void Source::dumpDebugLogs() const { diff --git a/src/mbgl/style/source.hpp b/src/mbgl/style/source.hpp index 4eae37a2a..fd916909e 100644 --- a/src/mbgl/style/source.hpp +++ b/src/mbgl/style/source.hpp @@ -92,7 +92,7 @@ private: // TileDataObserver implementation. void onTileLoaded(TileData&, bool isNewTile) override; void onTileError(TileData&, std::exception_ptr) override; - void onPlacementRedone(TileData&) override; + void onNeedsRepaint() override; std::unique_ptr createTile(const OverscaledTileID&, const UpdateParameters&); diff --git a/src/mbgl/style/source_observer.hpp b/src/mbgl/style/source_observer.hpp index a669e8e75..020ead4db 100644 --- a/src/mbgl/style/source_observer.hpp +++ b/src/mbgl/style/source_observer.hpp @@ -18,7 +18,7 @@ public: virtual void onSourceError(Source&, std::exception_ptr) {} virtual void onTileLoaded(Source&, const OverscaledTileID&, bool /* isNewTile */) {} virtual void onTileError(Source&, const OverscaledTileID&, std::exception_ptr) {} - virtual void onPlacementRedone() {} + virtual void onNeedsRepaint() {} }; } // namespace style diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 5ca36b030..2ddfb64a6 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -373,7 +373,7 @@ void Style::setObserver(style::Observer* observer_) { void Style::onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) { shouldReparsePartialTiles = true; observer->onGlyphsLoaded(fontStack, glyphRange); - observer->onResourceLoaded(); + observer->onNeedsRepaint(); } void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) { @@ -386,7 +386,7 @@ void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRan void Style::onSourceLoaded(Source& source) { observer->onSourceLoaded(source); - observer->onResourceLoaded(); + observer->onNeedsRepaint(); } void Style::onSourceError(Source& source, std::exception_ptr error) { @@ -403,7 +403,7 @@ void Style::onTileLoaded(Source& source, const OverscaledTileID& tileID, bool is } observer->onTileLoaded(source, tileID, isNewTile); - observer->onResourceLoaded(); + observer->onNeedsRepaint(); } void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exception_ptr error) { @@ -414,14 +414,14 @@ void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exc observer->onResourceError(error); } -void Style::onPlacementRedone() { - observer->onResourceLoaded(); +void Style::onNeedsRepaint() { + observer->onNeedsRepaint(); } void Style::onSpriteLoaded() { shouldReparsePartialTiles = true; observer->onSpriteLoaded(); - observer->onResourceLoaded(); + observer->onNeedsRepaint(); } void Style::onSpriteError(std::exception_ptr error) { diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp index 05a975a95..522f120d3 100644 --- a/src/mbgl/style/style.hpp +++ b/src/mbgl/style/style.hpp @@ -112,7 +112,7 @@ private: void onSourceError(Source&, std::exception_ptr) override; void onTileLoaded(Source&, const OverscaledTileID&, bool isNewTile) override; void onTileError(Source&, const OverscaledTileID&, std::exception_ptr) override; - void onPlacementRedone() override; + void onNeedsRepaint() override; Observer nullObserver; Observer* observer = &nullObserver; diff --git a/src/mbgl/tile/geometry_tile_data.cpp b/src/mbgl/tile/geometry_tile_data.cpp index 1f1bca653..39a379a8e 100644 --- a/src/mbgl/tile/geometry_tile_data.cpp +++ b/src/mbgl/tile/geometry_tile_data.cpp @@ -174,7 +174,7 @@ void GeometryTileData::redoPlacement() { if (placedConfig != targetConfig) { redoPlacement(); } else { - observer->onPlacementRedone(*this); + observer->onNeedsRepaint(); } }); } diff --git a/src/mbgl/tile/tile_data_observer.hpp b/src/mbgl/tile/tile_data_observer.hpp index ce2460989..b950fc0b7 100644 --- a/src/mbgl/tile/tile_data_observer.hpp +++ b/src/mbgl/tile/tile_data_observer.hpp @@ -12,7 +12,7 @@ public: virtual void onTileLoaded(TileData&, bool /*isNewTile*/) {} virtual void onTileError(TileData&, std::exception_ptr) {} - virtual void onPlacementRedone(TileData&) {} + virtual void onNeedsRepaint() {} }; } // namespace mbgl diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index d70fc5e44..ae0a23f0a 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -43,8 +43,8 @@ public: if (tileError) tileError(source, tileID, error); } - void onResourceLoaded() override { - if (resourceLoaded) resourceLoaded(); + void onNeedsRepaint() override { + if (needsRepaint) needsRepaint(); }; void onResourceError(std::exception_ptr error) override { @@ -59,6 +59,6 @@ public: std::function sourceError; std::function tileLoaded; std::function tileError; - std::function resourceLoaded; + std::function needsRepaint; std::function resourceError; };