Add dyn
This commit is contained in:
parent
20ec170552
commit
0ab20e01c1
|
@ -54,17 +54,13 @@ impl<'gc> DisplayObject<'gc> for DisplayObjectBase<'gc> {
|
||||||
fn set_clip_depth(&mut self, depth: Depth) {
|
fn set_clip_depth(&mut self, depth: Depth) {
|
||||||
self.clip_depth = depth;
|
self.clip_depth = depth;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
fn box_clone(&self) -> Box<dyn DisplayObject<'gc>> {
|
|
||||||
=======
|
|
||||||
fn parent(&self) -> Option<DisplayNode<'gc>> {
|
fn parent(&self) -> Option<DisplayNode<'gc>> {
|
||||||
self.parent
|
self.parent
|
||||||
}
|
}
|
||||||
fn set_parent(&mut self, parent: Option<DisplayNode<'gc>>) {
|
fn set_parent(&mut self, parent: Option<DisplayNode<'gc>>) {
|
||||||
self.parent = parent;
|
self.parent = parent;
|
||||||
}
|
}
|
||||||
fn box_clone(&self) -> Box<DisplayObject<'gc>> {
|
fn box_clone(&self) -> Box<dyn DisplayObject<'gc>> {
|
||||||
>>>>>>> core: Add parent to DisplayObjectBase
|
|
||||||
Box::new(self.clone())
|
Box::new(self.clone())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue