[all] ensure runloop is the current scheduler

This commit is contained in:
Ivo van Dongen
2017-07-25 18:35:38 +03:00
committed by Ivo van Dongen
parent 2a8cc4b3e1
commit f4f4d13b70
7 changed files with 30 additions and 41 deletions

View File

@@ -1,9 +1,9 @@
#include "file_source.hpp"
#include <mbgl/actor/actor.hpp>
#include <mbgl/actor/scheduler.hpp>
#include <mbgl/storage/resource_transform.hpp>
#include <mbgl/util/logging.hpp>
#include <mbgl/util/run_loop.hpp>
#include "asset_manager_file_source.hpp"
#include "jni/generic_global_ref_deleter.hpp"
@@ -45,7 +45,7 @@ void FileSource::setAPIBaseUrl(jni::JNIEnv& env, jni::String url) {
void FileSource::setResourceTransform(jni::JNIEnv& env, jni::Object<FileSource::ResourceTransformCallback> transformCallback) {
if (transformCallback) {
resourceTransform = std::make_unique<Actor<ResourceTransform>>(*util::RunLoop::Get(),
resourceTransform = std::make_unique<Actor<ResourceTransform>>(*Scheduler::GetCurrent(),
// Capture the ResourceTransformCallback object as a managed global into
// the lambda. It is released automatically when we're setting a new ResourceTransform in
// a subsequent call.