From 361982fef83a145769da5c04d1c19731df89921c Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 22 Nov 2018 15:37:09 +0200 Subject: [core][Android][Darwin] LayerManager creates RenderLayer instances `LayerManager` is now responsible for `RenderLayer` instances creation, so that there is a single entry point for creating of objects, which correspond to a certain layer type. The `LayerType type` field is dropped from `Layer::Impl`. --- src/mbgl/style/layer_impl.hpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/mbgl/style/layer_impl.hpp') diff --git a/src/mbgl/style/layer_impl.hpp b/src/mbgl/style/layer_impl.hpp index 948bbab619..c64173600e 100644 --- a/src/mbgl/style/layer_impl.hpp +++ b/src/mbgl/style/layer_impl.hpp @@ -29,7 +29,7 @@ namespace style { */ class Layer::Impl { public: - Impl(LayerType, std::string layerID, std::string sourceID); + Impl(std::string layerID, std::string sourceID); virtual ~Impl() = default; Impl& operator=(const Impl&) = delete; @@ -47,8 +47,6 @@ public: // Populates the given \a fontStack with fonts being used by the layer. virtual void populateFontStack(std::set& fontStack) const; - // Note: LayerType is deprecated, do not use it. - const LayerType type; std::string id; std::string source; std::string sourceLayer; @@ -61,5 +59,10 @@ protected: Impl(const Impl&) = default; }; +// To be used in the inherited classes. +#define DECLARE_LAYER_TYPE_INFO \ +const LayerTypeInfo* getTypeInfo() const noexcept final { return staticTypeInfo(); } \ +static const LayerTypeInfo* staticTypeInfo() noexcept + } // namespace style -} // namespace mbgl +} // namespace mbgl \ No newline at end of file -- cgit v1.2.1