summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-06-13 10:50:16 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-07-18 10:45:12 +0200
commit57351c068b133ed140ac7b991181672019fe5c24 (patch)
tree2a0be8819c2bc57b1cda7d5c6f98e725a030daa2 /src
parente35cbbae55ab01f33690b1bb2e918c5f8393b854 (diff)
downloadqtlocation-mapboxgl-57351c068b133ed140ac7b991181672019fe5c24.tar.gz
[core] split backend from mapobserver
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/map.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e644f91c4f..172b2bf851 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -49,6 +49,7 @@ class Map::Impl : public style::Observer,
public:
Impl(Map&,
Backend&,
+ MapObserver&,
float pixelRatio,
FileSource&,
Scheduler&,
@@ -104,6 +105,7 @@ public:
};
Map::Map(Backend& backend,
+ MapObserver& mapObserver,
const Size size,
const float pixelRatio,
FileSource& fileSource,
@@ -115,6 +117,7 @@ Map::Map(Backend& backend,
optional<std::string> programCacheDir)
: impl(std::make_unique<Impl>(*this,
backend,
+ mapObserver,
pixelRatio,
fileSource,
scheduler,
@@ -128,6 +131,7 @@ Map::Map(Backend& backend,
Map::Impl::Impl(Map& map_,
Backend& backend_,
+ MapObserver& mapObserver,
float pixelRatio_,
FileSource& fileSource_,
Scheduler& scheduler_,
@@ -137,7 +141,7 @@ Map::Impl::Impl(Map& map_,
ViewportMode viewportMode_,
optional<std::string> programCacheDir_)
: map(map_),
- observer(backend_),
+ observer(mapObserver),
backend(backend_),
fileSource(fileSource_),
scheduler(scheduler_),