[core] private OffscreenView implementation

7 files changed, 32 insertions, 32 deletions

diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp
index 9ac3369284..6644e9c92c 100644
--- a/test/api/annotations.test.cpp
+++ b/test/api/annotations.test.cpp
@@ -27,7 +27,7 @@ public:
     OffscreenView view { backend.getContext() };
     StubFileSource fileSource;
     ThreadPool threadPool { 4 };
-    Map map { backend, view.size, 1, fileSource, threadPool, MapMode::Still };
+    Map map { backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still };
 
     void checkRendering(const char * name) {
         test::checkImage(std::string("test/fixtures/annotations/") + name,
@@ -45,7 +45,7 @@ TEST(Annotations, SymbolAnnotation) {
     test.map.addAnnotation(SymbolAnnotation { Point<double>(0, 0), "default_marker" });
     test.checkRendering("point_annotation");
 
-//    auto size = test.view.size;
+//    auto size = test.view.getSize();
 //    auto screenBox = ScreenBox { {}, { double(size.width), double(size.height) } };
 //    for (uint8_t zoom = test.map.getMinZoom(); zoom <= test.map.getMaxZoom(); ++zoom) {
 //        test.map.setZoom(zoom);
@@ -351,7 +351,7 @@ TEST(Annotations, QueryRenderedFeatures) {
 TEST(Annotations, QueryFractionalZoomLevels) {
     AnnotationTest test;
 
-    auto viewSize = test.view.size;
+    auto viewSize = test.view.getSize();
     auto box = ScreenBox { {}, { double(viewSize.width), double(viewSize.height) } };
 
     test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
@@ -383,7 +383,7 @@ TEST(Annotations, QueryFractionalZoomLevels) {
 TEST(Annotations, VisibleFeatures) {
     AnnotationTest test;
 
-    auto viewSize = test.view.size;
+    auto viewSize = test.view.getSize();
     auto box = ScreenBox { {}, { double(viewSize.width), double(viewSize.height) } };
 
     test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp
index 34272f5366..1a61872f79 100644
--- a/test/api/api_misuse.test.cpp
+++ b/test/api/api_misuse.test.cpp
@@ -27,7 +27,7 @@ TEST(API, RenderWithoutCallback) {
     ThreadPool threadPool(4);
 
     std::unique_ptr<Map> map =
-        std::make_unique<Map>(backend, view.size, 1, fileSource, threadPool, MapMode::Still);
+        std::make_unique<Map>(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
     map->renderStill(view, nullptr);
 
     // Force Map thread to join.
@@ -51,7 +51,7 @@ TEST(API, RenderWithoutStyle) {
     StubFileSource fileSource;
     ThreadPool threadPool(4);
 
-    Map map(backend, view.size, 1, fileSource, threadPool, MapMode::Still);
+    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
 
     std::exception_ptr error;
     map.renderStill(view, [&](std::exception_ptr error_) {
diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp
index 73b4e94af5..dd56197463 100644
--- a/test/api/custom_layer.test.cpp
+++ b/test/api/custom_layer.test.cpp
@@ -97,7 +97,7 @@ TEST(CustomLayer, Basic) {
 
     ThreadPool threadPool(4);
 
-    Map map(backend, view.size, 1, fileSource, threadPool, MapMode::Still);
+    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/water.json"));
     map.setLatLngZoom({ 37.8, -122.5 }, 10);
     map.addLayer(std::make_unique<CustomLayer>(
diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp
index 86687fc818..4d2bf00f67 100644
--- a/test/api/query.test.cpp
+++ b/test/api/query.test.cpp
@@ -30,7 +30,7 @@ public:
     OffscreenView view { backend.getContext() };
     StubFileSource fileSource;
     ThreadPool threadPool { 4 };
-    Map map { backend, view.size, 1, fileSource, threadPool, MapMode::Still };
+    Map map { backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still };
 };
 
 } // end namespace
diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp
index a5c59913bc..c1bf7e5702 100644
--- a/test/api/render_missing.test.cpp
+++ b/test/api/render_missing.test.cpp
@@ -38,7 +38,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) {
 
     Log::setObserver(std::make_unique<FixtureLogObserver>());
 
-    Map map(backend, view.size, 1, fileSource, threadPool, MapMode::Still);
+    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
 
     std::string message;
 
diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp
index 49b9a31b0b..800813075f 100644
--- a/test/api/repeated_render.test.cpp
+++ b/test/api/repeated_render.test.cpp
@@ -34,7 +34,7 @@ TEST(API, RepeatedRender) {
 
     Log::setObserver(std::make_unique<FixtureLogObserver>());
 
-    Map map(backend, view.size, 1, fileSource, threadPool, MapMode::Still);
+    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Still);
 
     {
         map.setStyleJSON(style);
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp
index a00a4efacc..618c2e6a74 100644
--- a/test/map/map.test.cpp
+++ b/test/map/map.test.cpp
@@ -34,7 +34,7 @@ struct MapTest {
 
 TEST(Map, LatLngBehavior) {
     MapTest test;
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
 
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
@@ -68,7 +68,7 @@ TEST(Map, Offline) {
     fileSource.put(Resource::glyphs(prefix + "{fontstack}/{range}.pbf", {{"Helvetica"}}, {0, 255}), expiredItem("glyph.pbf"));
     NetworkStatus::Set(NetworkStatus::Status::Offline);
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL(prefix + "style.json");
 
     test::checkImage("test/fixtures/map/offline",
@@ -92,7 +92,7 @@ TEST(Map, SetStyleInvalidJSON) {
     });
 
     {
-        Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool,
+        Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool,
                 MapMode::Still);
         map.setStyleJSON("invalid");
     }
@@ -124,7 +124,7 @@ TEST(Map, SetStyleInvalidURL) {
         }
     });
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("mapbox://bar");
 
     test.runLoop.run();
@@ -133,7 +133,7 @@ TEST(Map, SetStyleInvalidURL) {
 TEST(Map, DoubleStyleLoad) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON("");
     map.setStyleJSON("");
 }
@@ -144,7 +144,7 @@ TEST(Map, StyleFresh) {
     MapTest test;
     FakeFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("mapbox://styles/test");
     EXPECT_EQ(1u, fileSource.requests.size());
 
@@ -164,7 +164,7 @@ TEST(Map, StyleExpired) {
     MapTest test;
     FakeFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("mapbox://styles/test");
     EXPECT_EQ(1u, fileSource.requests.size());
 
@@ -191,7 +191,7 @@ TEST(Map, StyleExpiredWithAnnotations) {
     MapTest test;
     FakeFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("mapbox://styles/test");
     EXPECT_EQ(1u, fileSource.requests.size());
 
@@ -215,7 +215,7 @@ TEST(Map, StyleEarlyMutation) {
     MapTest test;
     FakeFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("mapbox://styles/test");
     map.addLayer(std::make_unique<style::BackgroundLayer>("bg"));
 
@@ -229,7 +229,7 @@ TEST(Map, StyleEarlyMutation) {
 
 TEST(Map, StyleLoadedSignal) {
     MapTest test;
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
 
     // The map should emit a signal on style loaded
     bool emitted = false;
@@ -252,7 +252,7 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNetworkErrorRetry)) {
     MapTest test;
     OnlineFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("http://127.0.0.1:3000/style-fail-once-500");
 
     test.backend.setMapChangeCallback([&](MapChange change) {
@@ -268,7 +268,7 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) {
     MapTest test;
     OnlineFileSource fileSource;
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleURL("http://127.0.0.1:3000/style-fail-once-404");
 
     using namespace std::chrono_literals;
@@ -297,7 +297,7 @@ TEST(Map, TEST_REQUIRES_SERVER(StyleNotFound)) {
 TEST(Map, AddLayer) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     auto layer = std::make_unique<BackgroundLayer>("background");
@@ -319,7 +319,7 @@ TEST(Map, WithoutVAOExtension) {
     DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
 #endif
 
-    Map map(test.backend, test.view.size, 1, fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/water.json"));
 
     test::checkImage("test/fixtures/map/no_vao", test::render(map, test.view), 0.002);
@@ -328,7 +328,7 @@ TEST(Map, WithoutVAOExtension) {
 TEST(Map, RemoveLayer) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     auto layer = std::make_unique<BackgroundLayer>("background");
@@ -353,7 +353,7 @@ TEST(Map, DisabledSources) {
         return {};
     };
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setZoom(1);
 
     // This stylesheet has two raster layers, one that starts at zoom 1, the other at zoom 0.
@@ -403,7 +403,7 @@ TEST(Map, DisabledSources) {
 TEST(Map, Classes) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
 
     EXPECT_FALSE(map.getTransitionOptions().duration);
@@ -437,7 +437,7 @@ TEST(Map, Classes) {
 TEST(Map, AddImage) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     auto decoded1 = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
     auto decoded2 = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
     auto image1 = std::make_unique<SpriteImage>(std::move(decoded1), 1.0);
@@ -454,7 +454,7 @@ TEST(Map, AddImage) {
 TEST(Map, RemoveImage) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     auto decoded = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
     auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
 
@@ -467,7 +467,7 @@ TEST(Map, RemoveImage) {
 TEST(Map, GetImage) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     auto decoded = decodeImage(util::read_file("test/fixtures/sprites/default_marker.png"));
     auto image = std::make_unique<SpriteImage>(std::move(decoded), 1.0);
 
@@ -479,7 +479,7 @@ TEST(Map, GetImage) {
 TEST(Map, DontLoadUnneededTiles) {
     MapTest test;
 
-    Map map(test.backend, test.view.size, 1, test.fileSource, test.threadPool, MapMode::Still);
+    Map map(test.backend, test.view.getSize(), 1, test.fileSource, test.threadPool, MapMode::Still);
     map.setStyleJSON(R"STYLE({
   "sources": {
     "a": { "type": "vector", "tiles": [ "a/{z}/{x}/{y}" ] }
@@ -552,7 +552,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) {
     DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets");
 #endif
 
-    Map map(backend, view.size, 1, fileSource, threadPool, MapMode::Continuous);
+    Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Continuous);
 
     using namespace std::chrono_literals;