pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #6146 from darina/overlay-tree-clearing

Browse source 
Clear overlay tree on context destruction.
This commit is contained in:
Roman Kuznetsov 2017-05-29 17:46:18 +03:00 • committed by GitHub
commit 2192d85a55
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drape/overlay_tree.cpp
View file

@ -87,6 +87,15 @@ OverlayTree::OverlayTree()
m_handles[i].reserve(kAverageHandlesCount[i]);
}
void OverlayTree::Clear()
{
m_frameCounter = kInvalidFrame;
TBase::Clear();
m_handlesCache.clear();
for (auto & handles : m_handles)
handles.clear();
}
bool OverlayTree::Frame()
{
if (IsNeedUpdate())
@ -107,7 +116,7 @@ bool OverlayTree::IsNeedUpdate() const
void OverlayTree::StartOverlayPlacing(ScreenBase const & screen)
{
ASSERT(IsNeedUpdate(), ());
Clear();
TBase::Clear();
m_handlesCache.clear();
m_traits.m_modelView = screen;
m_displacementInfo.clear();

1
drape/overlay_tree.hpp
View file

@ -48,6 +48,7 @@ public:
OverlayTree();
void Clear();
bool Frame();
bool IsNeedUpdate() const;

1
drape_frontend/frontend_renderer.cpp
View file

@ -1668,6 +1668,7 @@ void FrontendRenderer::OnContextDestroy()
m_selectObjectMessage.reset();
m_overlayTree->SetSelectedFeature(FeatureID());
m_overlayTree->Clear();
m_userMarkRenderGroups.clear();
m_guiRenderer.reset();