[core] Replace createRender{Source,Layer} with Render{Source,Layer}::create

* Eliminates the need for EnableImmutableFromThis
* Eliminates the dependency of {Source,Layer}::Impl on corresponding Render class (circular dependency)

2 files changed, 10 insertions, 10 deletions

diff --git a/test/renderer/group_by_layout.test.cpp b/test/renderer/group_by_layout.test.cpp
index 9c8e09e222..958f1bdf24 100644
--- a/test/renderer/group_by_layout.test.cpp
+++ b/test/renderer/group_by_layout.test.cpp
@@ -13,7 +13,7 @@ static std::vector<std::unique_ptr<RenderLayer>> toRenderLayers(const std::vecto
     std::vector<std::unique_ptr<RenderLayer>> result;
     result.reserve(layers.size());
     for (auto& layer : layers) {
-        result.push_back(layer->baseImpl->createRenderLayer());
+        result.push_back(RenderLayer::create(layer->baseImpl));
     }
     return result;
 }
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index ad28db7c19..0473286c8b 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -148,7 +148,7 @@ TEST(Source, RasterTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -179,7 +179,7 @@ TEST(Source, VectorTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -210,7 +210,7 @@ TEST(Source, RasterTileFail) {
         test.end();
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -241,7 +241,7 @@ TEST(Source, VectorTileFail) {
         test.end();
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -271,7 +271,7 @@ TEST(Source, RasterTileCorrupt) {
         test.end();
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -305,7 +305,7 @@ TEST(Source, VectorTileCorrupt) {
         test.end();
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -334,7 +334,7 @@ TEST(Source, RasterTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -363,7 +363,7 @@ TEST(Source, VectorTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->setObserver(&test.renderSourceObserver);
     renderSource->updateTiles(test.tileParameters);
 
@@ -401,7 +401,7 @@ TEST(Source, RasterTileAttribution) {
     source.setObserver(&test.styleObserver);
     source.loadDescription(test.fileSource);
 
-    auto renderSource = source.baseImpl->createRenderSource();
+    auto renderSource = RenderSource::create(source.baseImpl);
     renderSource->updateTiles(test.tileParameters);
 
     test.run();