[core] Push layouts and paints to subclasses

1 files changed, 3 insertions, 5 deletions

diff --git a/src/mbgl/style/paint_properties_map.hpp b/src/mbgl/style/paint_properties_map.hpp
index 26fd8301ba..e32f723d8d 100644
--- a/src/mbgl/style/paint_properties_map.hpp
+++ b/src/mbgl/style/paint_properties_map.hpp
@@ -18,14 +18,13 @@ namespace mbgl {
 
 class ClassProperties;
 class PropertyTransition;
+class StyleCascadeParameters;
 
 using JSVal = rapidjson::Value;
 
 class PaintPropertiesMap {
 public:
-    void cascade(const std::vector<std::string>& classNames,
-                 const TimePoint& now,
-                 const PropertyTransition& defaultTransition);
+    void cascade(const StyleCascadeParameters&);
 
     bool hasTransitions() const;
     void removeExpiredTransitions(const TimePoint& now);
@@ -81,8 +80,7 @@ private:
     // Applies all properties from a class, if they haven't been applied already.
     void cascadeClass(const ClassID,
                       std::set<PropertyKey>&,
-                      const TimePoint&,
-                      const PropertyTransition&);
+                      const StyleCascadeParameters&);
 
     // For every property, stores a list of applied property values, with
     // optional transition times.