[core] Render from the main thread
Do not create a thread for the MapContext anymore.
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#include <mbgl/platform/default/headless_view.hpp>
|
||||
#include <mbgl/storage/online_file_source.hpp>
|
||||
#include <mbgl/util/exception.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
#include <future>
|
||||
|
||||
@@ -15,6 +16,8 @@ TEST(API, RenderWithoutCallback) {
|
||||
FixtureLogObserver* log = new FixtureLogObserver();
|
||||
Log::setObserver(std::unique_ptr<Log::Observer>(log));
|
||||
|
||||
util::RunLoop loop;
|
||||
|
||||
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
||||
HeadlessView view(display, 1);
|
||||
view.resize(128, 512);
|
||||
@@ -37,6 +40,8 @@ TEST(API, RenderWithoutCallback) {
|
||||
}
|
||||
|
||||
TEST(API, RenderWithoutStyle) {
|
||||
util::RunLoop loop;
|
||||
|
||||
auto display = std::make_shared<mbgl::HeadlessDisplay>();
|
||||
HeadlessView view(display, 1);
|
||||
view.resize(128, 512);
|
||||
@@ -44,13 +49,16 @@ TEST(API, RenderWithoutStyle) {
|
||||
|
||||
Map map(view, fileSource, MapMode::Still);
|
||||
|
||||
std::promise<std::exception_ptr> promise;
|
||||
map.renderStill([&promise](std::exception_ptr error, PremultipliedImage&&) {
|
||||
promise.set_value(error);
|
||||
std::exception_ptr error;
|
||||
map.renderStill([&](std::exception_ptr error_, PremultipliedImage&&) {
|
||||
error = error_;
|
||||
loop.stop();
|
||||
});
|
||||
|
||||
loop.run();
|
||||
|
||||
try {
|
||||
std::rethrow_exception(promise.get_future().get());
|
||||
std::rethrow_exception(error);
|
||||
} catch (const util::MisuseException& ex) {
|
||||
EXPECT_EQ(std::string(ex.what()), "Map doesn't have a style");
|
||||
} catch (const std::exception&) {
|
||||
|
||||
Reference in New Issue
Block a user