Fixed drape engine destruction on iOS, moved some common code to renderer

1 files changed, 19 insertions, 2 deletions

diff --git a/drape_frontend/base_renderer.hpp b/drape_frontend/base_renderer.hpp
index 391b5fda03..94b3fc8cb1 100644
--- a/drape_frontend/base_renderer.hpp
+++ b/drape_frontend/base_renderer.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
 #include "message_acceptor.hpp"
+#include "../base/thread.hpp"
+#include "../drape/oglcontextfactory.hpp"
+
 #include "../std/atomic.hpp"
 #include "../std/condition_variable.hpp"
 #include "../std/function.hpp"
@@ -9,18 +12,31 @@
 namespace df
 {
 
-class BaseRenderer : public MessageAcceptor
+class ThreadsCommutator;
+
+class BaseRenderer : public MessageAcceptor,
+                     public threads::IRoutine
 {
 public:
   using TCompletionHandler = function<void()>;
 
-  BaseRenderer();
+  BaseRenderer(dp::RefPointer<ThreadsCommutator> commutator,
+               dp::RefPointer<dp::OGLContextFactory> oglcontextfactory);
+
   void SetRenderingEnabled(bool const isEnabled);
+  void ClearRenderingQueueSynchronously();
 
 protected:
+  dp::RefPointer<ThreadsCommutator> m_commutator;
+  dp::RefPointer<dp::OGLContextFactory> m_contextFactory;
+
+  void StartThread();
+  void StopThread();
   void CheckRenderingEnabled();
 
 private:
+  threads::Thread m_selfThread;
+
   mutex m_renderingEnablingMutex;
   condition_variable m_renderingEnablingCondition;
   atomic<bool> m_isEnabled;
@@ -29,6 +45,7 @@ private:
 
   void SetRenderingEnabled(bool const isEnabled, TCompletionHandler completionHandler);
   void Notify();
+  void WakeUp();
 };
 
 } // namespace df