update uv_zip and add tests

2 files changed, 8 insertions, 3 deletions

diff --git a/include/mbgl/storage/default/shared_request_base.hpp b/include/mbgl/storage/default/shared_request_base.hpp
index a0f3e8d4e3..7745bef2b5 100644
--- a/include/mbgl/storage/default/shared_request_base.hpp
+++ b/include/mbgl/storage/default/shared_request_base.hpp
@@ -78,8 +78,10 @@ protected:
 public:
     const Resource resource;
 
-private:
+protected:
     DefaultFileSource *source = nullptr;
+
+private:
     std::set<Request *> observers;
 };
 
diff --git a/include/mbgl/storage/default_file_source.hpp b/include/mbgl/storage/default_file_source.hpp
index 21048e99e5..86e2414041 100644
--- a/include/mbgl/storage/default_file_source.hpp
+++ b/include/mbgl/storage/default_file_source.hpp
@@ -18,8 +18,8 @@ class SharedRequestBase;
 
 class DefaultFileSource : public FileSource {
 public:
-    DefaultFileSource(FileCache *cache);
-    DefaultFileSource(FileCache *cache, uv_loop_t *loop);
+    DefaultFileSource(FileCache *cache, const std::string &root = "");
+    DefaultFileSource(FileCache *cache, uv_loop_t *loop, const std::string &root = "");
     ~DefaultFileSource();
 
     Request *request(const Resource &resource, uv_loop_t *loop, Callback callback);
@@ -30,6 +30,9 @@ public:
     void notify(SharedRequestBase *sharedRequest, const std::set<Request *> &observers,
                 std::shared_ptr<const Response> response, FileCache::Hint hint);
 
+public:
+    const std::string assetRoot;
+
 private:
     struct ActionDispatcher;
     struct AddRequestAction;