[core] Eliminate TileData dependency on TileSource

This commit is contained in:
John Firebaugh
2016-06-06 17:15:23 -07:00
committed by Konstantin Käfer
parent dbf16440a6
commit b45713e5e9
10 changed files with 53 additions and 24 deletions

View File

@@ -1,6 +1,5 @@
#include <mbgl/tile/tile_data.hpp>
#include <mbgl/tile/tile_data_observer.hpp>
#include <mbgl/tile/tile_source.hpp>
#include <mbgl/renderer/debug_bucket.hpp>
#include <mbgl/util/string.hpp>
@@ -18,16 +17,6 @@ void TileData::setObserver(TileDataObserver* observer_) {
observer = observer_;
}
void TileData::setTileSource(std::unique_ptr<TileSource> tileSource_) {
assert(!tileSource);
assert(tileSource_);
tileSource = std::move(tileSource_);
}
void TileData::setNecessity(Necessity necessity) {
tileSource->setNecessity(static_cast<TileSource::Necessity>(necessity));
}
void TileData::setTriedOptional() {
triedOptional = true;
observer->onNeedsRepaint();