Move Environment to MapContext

2015-04-23 15:58:27 -07:00
parent bb7c453b3e
commit 8bb7fc64ff
4 changed files with 10 additions and 38 deletions
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -30,11 +30,11 @@

 namespace mbgl {

-MapContext::MapContext(uv_loop_t* loop, Environment& env_, View& view_, MapData& data_, bool startPaused)
-    : env(env_),
-      view(view_),
+MapContext::MapContext(uv_loop_t* loop, View& view_, FileSource& fileSource, MapData& data_, bool startPaused)
+    : view(view_),
      data(data_),
-      mapScope(env, ThreadType::Map, "Map"),
+      env(fileSource),
+      envScope(env, ThreadType::Map, "Map"),
      updated(static_cast<UpdateType>(Update::Nothing)),
      asyncUpdate(util::make_unique<uv::async>(loop, [this] { update(); })),
      workers(util::make_unique<Worker>(loop, 4)),