Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	src/mbgl/renderer/painter_fill.cpp

1 files changed, 21 insertions, 0 deletions

diff --git a/test/style/mock_view.hpp b/test/style/mock_view.hpp
new file mode 100644
index 0000000000..865cd2da55
--- /dev/null
+++ b/test/style/mock_view.hpp
@@ -0,0 +1,21 @@
+#ifndef TEST_RESOURCES_MOCK_VIEW
+#define TEST_RESOURCES_MOCK_VIEW
+
+#include <mbgl/map/view.hpp>
+
+namespace mbgl {
+
+class MockView : public View {
+public:
+    MockView() = default;
+
+    // View implementation.
+    void activate() override {};
+    void deactivate() override {};
+    void notify() override {};
+    void invalidate(std::function<void()>) override {};
+};
+
+}
+
+#endif