liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Remove double-ended support for `ChildIter` as it's unnecessary and wastes time

This commit is contained in:
David Wendt 2020-11-04 17:19:55 -05:00 committed by Mike Welsh
parent 1f2c194ffd
commit a2d876bc8c
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/display_object.rs
View File

@ -670,7 +670,6 @@ pub trait TDisplayObject<'gc>:
fn last_child(&self) -> Option<DisplayObject<'gc>> {
let mut last = self.first_child()?;
while let Some(l) = last.next_sibling() {
log::error!("Searching for last child, got child at {}", l.depth());
last = l;
}
@ -682,7 +681,6 @@ pub trait TDisplayObject<'gc>:
fn children(&self) -> ChildIter<'gc> {
ChildIter {
cur_child: self.first_child(),
rev_child: self.last_child(),
}
}
@ -1270,7 +1268,6 @@ enum DisplayObjectFlags {
pub struct ChildIter<'gc> {
cur_child: Option<DisplayObject<'gc>>,
rev_child: Option<DisplayObject<'gc>>,
}
impl<'gc> Iterator for ChildIter<'gc> {
@ -1282,38 +1279,6 @@ impl<'gc> Iterator for ChildIter<'gc> {
.cur_child
.and_then(|display_cell| display_cell.next_sibling());
if cur.is_none()
|| self
.rev_child
.map(|r| DisplayObject::ptr_eq(r, cur.unwrap()))
.unwrap_or(false)
{
self.cur_child = None;
self.rev_child = None;
}
cur
}
}
impl<'gc> DoubleEndedIterator for ChildIter<'gc> {
fn next_back(&mut self) -> Option<Self::Item> {
let rev = self.rev_child;
self.rev_child = self
.rev_child
.and_then(|display_cell| display_cell.prev_sibling());
if rev.is_none()
|| self
.cur_child
.map(|c| DisplayObject::ptr_eq(c, rev.unwrap()))
.unwrap_or(false)
{
self.cur_child = None;
self.rev_child = None;
}
rev
}
}