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

xml: Make `XmlDocumentData::root` non-`Option` 

Since `XmlNode::document` doesn't exist anymore, so as the circular-
reference between `XmlDocument` and `XmlNode`.
This commit is contained in:
relrelb 2021-12-26 23:20:13 +02:00 committed by relrelb
parent 3676db47a3
commit 8bd144ec88
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/xml/document.rs
View File

@ -20,7 +20,7 @@ pub struct XmlDocument<'gc>(GcCell<'gc, XmlDocumentData<'gc>>);
#[collect(no_drop)] #[collect(no_drop)]
pub struct XmlDocumentData<'gc> { pub struct XmlDocumentData<'gc> {
/// The root node of the XML document. /// The root node of the XML document.
root: Option<XmlNode<'gc>>, root: XmlNode<'gc>,
/// Whether or not the document has a document declaration. /// Whether or not the document has a document declaration.
has_xmldecl: bool, has_xmldecl: bool,
@ -54,10 +54,10 @@ pub struct XmlDocumentData<'gc> {
impl<'gc> XmlDocument<'gc> { impl<'gc> XmlDocument<'gc> {
/// Construct a new, empty XML document. /// Construct a new, empty XML document.
pub fn new(mc: MutationContext<'gc, '_>) -> Self { pub fn new(mc: MutationContext<'gc, '_>) -> Self {
let document = Self(GcCell::allocate( Self(GcCell::allocate(
mc, mc,
XmlDocumentData { XmlDocumentData {
root: None, root: XmlNode::new_document_root(mc),
has_xmldecl: false, has_xmldecl: false,
version: "1.0".to_string(), version: "1.0".to_string(),
encoding: None, encoding: None,
@ -67,22 +67,14 @@ impl<'gc> XmlDocument<'gc> {
idmap_script_object: None, idmap_script_object: None,
last_parse_error: None, last_parse_error: None,
}, },
)); ))
let root = XmlNode::new_document_root(mc);
document.0.write(mc).root = Some(root);
document
} }
/// Yield the document in node form. /// Yield the document in node form.
/// ///
/// If the document does not have a node, then this function will panic. /// If the document does not have a node, then this function will panic.
pub fn as_node(self) -> XmlNode<'gc> { pub fn as_node(self) -> XmlNode<'gc> {
self.0 self.0.read().root
.read()
.root
.expect("Document must always have a root node")
} }
/// Retrieve the first DocType node in the document. /// Retrieve the first DocType node in the document.