Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 11:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #17522 - Replace ParseNodeID with ParseNodeId (from streichgeorg:master); r=emilio

Browse Source 
<!-- Please describe your changes on the following line: -->
---
Not really much to this...
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #17519 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 8d9b995b344a01cf9e8fa2149afb99c4d0ad3c25

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 30a67d3b623d02e899f5d589bf073b7f5d834665
This commit is contained in:
streichgeorg 2017-06-26 22:46:27 -07:00
parent 676e702f00
commit a6c141b000
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
servo/components/script/dom/servoparser/async_html.rs
View File

@ -128,11 +128,11 @@ unsafe impl JSTraceable for HtmlTokenizer<TreeBuilder<ParseNode, Sink>> {
}
}
type ParseNodeID = usize;
type ParseNodeId = usize;
#[derive(JSTraceable, Clone, HeapSizeOf)]
pub struct ParseNode {
id: ParseNodeID,
id: ParseNodeId,
qual_name: Option<QualName>,
}
@ -152,21 +152,21 @@ impl Default for ParseNodeData {
}
enum ParseOperation {
GetTemplateContents(ParseNodeID, ParseNodeID),
CreateElement(ParseNodeID, QualName, Vec<Attribute>),
CreateComment(StrTendril, ParseNodeID),
GetTemplateContents(ParseNodeId, ParseNodeId),
CreateElement(ParseNodeId, QualName, Vec<Attribute>),
CreateComment(StrTendril, ParseNodeId),
// sibling, node to be inserted
AppendBeforeSibling(ParseNodeID, NodeOrText<ParseNode>),
AppendBeforeSibling(ParseNodeId, NodeOrText<ParseNode>),
// parent, node to be inserted
Append(ParseNodeID, NodeOrText<ParseNode>),
Append(ParseNodeId, NodeOrText<ParseNode>),
AppendDoctypeToDocument(StrTendril, StrTendril, StrTendril),
AddAttrsIfMissing(ParseNodeID, Vec<Attribute>),
RemoveFromParent(ParseNodeID),
MarkScriptAlreadyStarted(ParseNodeID),
ReparentChildren(ParseNodeID, ParseNodeID),
AssociateWithForm(ParseNodeID, ParseNodeID),
CreatePI(ParseNodeID, StrTendril, StrTendril),
Pop(ParseNodeID),
AddAttrsIfMissing(ParseNodeId, Vec<Attribute>),
RemoveFromParent(ParseNodeId),
MarkScriptAlreadyStarted(ParseNodeId),
ReparentChildren(ParseNodeId, ParseNodeId),
AssociateWithForm(ParseNodeId, ParseNodeId),
CreatePI(ParseNodeId, StrTendril, StrTendril),
Pop(ParseNodeId),
}
#[derive(JSTraceable, HeapSizeOf)]
@ -176,9 +176,9 @@ pub struct Sink {
document: JS<Document>,
current_line: u64,
script: MutNullableJS<HTMLScriptElement>,
parse_node_data: HashMap<ParseNodeID, ParseNodeData>,
next_parse_node_id: Cell<ParseNodeID>,
nodes: HashMap<ParseNodeID, JS<Node>>,
parse_node_data: HashMap<ParseNodeId, ParseNodeData>,
next_parse_node_id: Cell<ParseNodeId>,
nodes: HashMap<ParseNodeId, JS<Node>>,
document_node: ParseNode,
}
@ -214,23 +214,23 @@ impl Sink {
}
}
fn insert_node(&mut self, id: ParseNodeID, node: JS<Node>) {
fn insert_node(&mut self, id: ParseNodeId, node: JS<Node>) {
assert!(self.nodes.insert(id, node).is_none());
}
fn get_node<'a>(&'a self, id: &ParseNodeID) -> &'a JS<Node> {
fn get_node<'a>(&'a self, id: &ParseNodeId) -> &'a JS<Node> {
self.nodes.get(id).expect("Node not found!")
}
fn insert_parse_node_data(&mut self, id: ParseNodeID, data: ParseNodeData) {
fn insert_parse_node_data(&mut self, id: ParseNodeId, data: ParseNodeData) {
assert!(self.parse_node_data.insert(id, data).is_none());
}
fn get_parse_node_data<'a>(&'a self, id: &'a ParseNodeID) -> &'a ParseNodeData {
fn get_parse_node_data<'a>(&'a self, id: &'a ParseNodeId) -> &'a ParseNodeData {
self.parse_node_data.get(id).expect("Parse Node data not found!")
}
fn get_parse_node_data_mut<'a>(&'a mut self, id: &'a ParseNodeID) -> &'a mut ParseNodeData {
fn get_parse_node_data_mut<'a>(&'a mut self, id: &'a ParseNodeId) -> &'a mut ParseNodeData {
self.parse_node_data.get_mut(id).expect("Parse Node data not found!")
}