[core] Avoid RenderStyle dependency in query code

This commit is contained in:
John Firebaugh
2017-08-12 11:20:49 -07:00
parent 3d3648387b
commit e706ed4b2e
21 changed files with 78 additions and 96 deletions

View File

@@ -4,7 +4,6 @@
#include <mbgl/util/default_thread_pool.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/renderer/render_style.hpp>
#include <mbgl/renderer/tile_parameters.hpp>
#include <mbgl/renderer/query.hpp>
#include <mbgl/text/collision_tile.hpp>
@@ -31,7 +30,6 @@ public:
AnnotationManager annotationManager { style };
HeadlessBackend backend;
BackendScope scope { backend };
RenderStyle renderStyle { threadPool, fileSource };
ImageManager imageManager;
GlyphManager glyphManager { fileSource };
@@ -93,7 +91,7 @@ TEST(AnnotationTile, Issue8289) {
TransformState transformState;
RenderedQueryOptions options;
tile.queryRenderedFeatures(result, queryGeometry, transformState, test.renderStyle, options);
tile.queryRenderedFeatures(result, queryGeometry, transformState, {}, options);
EXPECT_TRUE(result.empty());
}