diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-20 17:11:50 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-02 08:45:09 -0700 |
commit | 3f0c89d633a5056006557ad5f4b9e446807d00ee (patch) | |
tree | 5405c50dd26a5a393a982e8e0f76b764dbbccf48 /test/src | |
parent | 197751bace6181f2c2dbe4c890f277a0dc7e58b1 (diff) | |
download | qtlocation-mapboxgl-3f0c89d633a5056006557ad5f4b9e446807d00ee.tar.gz |
[core] Refactor Source::*Impls into RenderSources and TilePyramid
Diffstat (limited to 'test/src')
-rw-r--r-- | test/src/mbgl/test/stub_render_source_observer.hpp | 23 | ||||
-rw-r--r-- | test/src/mbgl/test/stub_style_observer.hpp | 11 |
2 files changed, 23 insertions, 11 deletions
diff --git a/test/src/mbgl/test/stub_render_source_observer.hpp b/test/src/mbgl/test/stub_render_source_observer.hpp new file mode 100644 index 0000000000..ff20fff80c --- /dev/null +++ b/test/src/mbgl/test/stub_render_source_observer.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include <mbgl/renderer/render_source_observer.hpp> + +using namespace mbgl; + +/** + * An implementation of style::Observer that forwards all methods to dynamically-settable lambdas. + */ +class StubRenderSourceObserver : public RenderSourceObserver { +public: + void onTileChanged(RenderSource& source, const OverscaledTileID& tileID) override { + if (tileChanged) tileChanged(source, tileID); + }; + + void + onTileError(RenderSource& source, const OverscaledTileID& tileID, std::exception_ptr error) override { + if (tileError) tileError(source, tileID, error); + } + + std::function<void (RenderSource&, const OverscaledTileID&)> tileChanged; + std::function<void (RenderSource&, const OverscaledTileID&, std::exception_ptr)> tileError; +}; diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index 9312cfa550..7e22c68823 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -42,15 +42,6 @@ public: if (sourceDescriptionChanged) sourceDescriptionChanged(source); } - void onTileChanged(Source& source, const OverscaledTileID& tileID) override { - if (tileChanged) tileChanged(source, tileID); - }; - - void - onTileError(Source& source, const OverscaledTileID& tileID, std::exception_ptr error) override { - if (tileError) tileError(source, tileID, error); - } - void onResourceError(std::exception_ptr error) override { if (resourceError) resourceError(error); }; @@ -63,7 +54,5 @@ public: std::function<void (Source&)> sourceChanged; std::function<void (Source&, std::exception_ptr)> sourceError; std::function<void (Source&)> sourceDescriptionChanged; - std::function<void (Source&, const OverscaledTileID&)> tileChanged; - std::function<void (Source&, const OverscaledTileID&, std::exception_ptr)> tileError; std::function<void (std::exception_ptr)> resourceError; }; |