Browse Source

Element: remove active_children

Michael Ragazzon 6 years ago
parent
commit
68825140d0
3 changed files with 2 additions and 17 deletions
  1. 0 2
      Include/Rocket/Core/Element.h
  2. 0 1
      Source/Core/Context.cpp
  3. 2 14
      Source/Core/Element.cpp

+ 0 - 2
Include/Rocket/Core/Element.h

@@ -628,7 +628,6 @@ protected:
 private:
 	void SetParent(Element* parent);
 
-	void ReleaseDeletedElements();
 	void ReleaseElements(ElementList& elements);
 
 	void DirtyOffset();
@@ -721,7 +720,6 @@ private:
 	ElementList children;
 	int num_non_dom_children;
 
-	ElementList active_children;
 	ElementList deleted_children;
 
 	float z_index;

+ 0 - 1
Source/Core/Context.cpp

@@ -363,7 +363,6 @@ void Context::UnloadAllDocuments()
 
 	// Force cleanup of child elements now, reference counts must hit zero so that python (if it's in use) cleans up
 	// before we exit this method.
-	root->active_children.clear();
 	root->ReleaseElements(root->deleted_children);
 
 	// Also need to clear containers that keep ElementReference pointers to elements belonging to removed documents,

+ 2 - 14
Source/Core/Element.cpp

@@ -205,7 +205,6 @@ Element::~Element()
 void Element::Update(float dp_ratio)
 {
 	ReleaseElements(deleted_children);
-	active_children = children;
 
 	OnUpdate();
 
@@ -254,8 +253,8 @@ void Element::Update(float dp_ratio)
 
 	UpdateTransformState();
 
-	for (size_t i = 0; i < active_children.size(); i++)
-		active_children[i]->Update(dp_ratio);
+	for (size_t i = 0; i < children.size(); i++)
+		children[i]->Update(dp_ratio);
 }
 
 void Element::Render()
@@ -2029,17 +2028,6 @@ void Element::SetParent(Element* _parent)
 	parent = _parent;
 }
 
-void Element::ReleaseDeletedElements()
-{
-	for (size_t i = 0; i < active_children.size(); i++)
-	{
-		active_children[i]->ReleaseDeletedElements();
-	}
-
-	ReleaseElements(deleted_children);
-	active_children = children;
-}
-
 void Element::ReleaseElements(ElementList& released_elements)
 {
 	// Remove deleted children from this element.