1 files changed, 9 insertions, 8 deletions
diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp
index a00a6c797d..8c84af4f1e 100644
--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -15,16 +15,16 @@
 
 namespace mbgl {
 
-class Painter;
+class PaintParameters;
 class TransformState;
 class RenderTile;
-class RenderStyle;
 class RenderLayer;
 class RenderedQueryOptions;
 class SourceQueryOptions;
 class Tile;
 class RenderSourceObserver;
 class TileParameters;
+class CollisionIndex;
 
 class RenderSource : protected TileObserver {
 public:
@@ -54,21 +54,22 @@ public:
                         bool needsRelayout,
                         const TileParameters&) = 0;
 
-    virtual void startRender(Painter&) = 0;
-    virtual void finishRender(Painter&) = 0;
+    virtual void startRender(PaintParameters&) = 0;
+    virtual void finishRender(PaintParameters&) = 0;
 
-    virtual std::map<UnwrappedTileID, RenderTile>& getRenderTiles() = 0;
+    // Returns an unsorted list of RenderTiles.
+    virtual std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() = 0;
 
     virtual std::unordered_map<std::string, std::vector<Feature>>
     queryRenderedFeatures(const ScreenLineString& geometry,
                           const TransformState& transformState,
-                          const RenderStyle& style,
-                          const RenderedQueryOptions& options) const = 0;
+                          const std::vector<const RenderLayer*>& layers,
+                          const RenderedQueryOptions& options,
+                          const CollisionIndex& collisionIndex) const = 0;
 
     virtual std::vector<Feature>
     querySourceFeatures(const SourceQueryOptions&) const = 0;
 
-    virtual void setCacheSize(size_t) = 0;
     virtual void onLowMemory() = 0;
 
     virtual void dumpDebugLogs() const = 0;