mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 11:15:34 +00:00
servo: Merge #17457 - Remove target and data fields from parse_node_data (from cynicaldevil:trim-parse-node-data); r=nox
<!-- Please describe your changes on the following line: --> `parse_node_data` does not need to store `data` and `target`, they can automatically be passed as parameters to the parser operation (`ParseOperation::CreatePI`) that we already create to be processed. Also, this frees up `process_op` from depending on the sink's `parse_node_data` field, which will later allow for the sink to exist on the parser thread separately. --- <!-- 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 - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] 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: 0fce761bb31f26f147054104c734d02d8aeb027f --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : acedcbec06a996a63fb2c01cd2e991a35da5774f
This commit is contained in:
parent
f52bbaa967
commit
b780284895
@ -138,8 +138,6 @@ pub struct ParseNode {
|
||||
|
||||
#[derive(JSTraceable, HeapSizeOf)]
|
||||
struct ParseNodeData {
|
||||
target: Option<String>,
|
||||
data: Option<String>,
|
||||
contents: Option<ParseNode>,
|
||||
is_integration_point: bool,
|
||||
}
|
||||
@ -147,8 +145,6 @@ struct ParseNodeData {
|
||||
impl Default for ParseNodeData {
|
||||
fn default() -> ParseNodeData {
|
||||
ParseNodeData {
|
||||
target: None,
|
||||
data: None,
|
||||
contents: None,
|
||||
is_integration_point: false,
|
||||
}
|
||||
@ -169,7 +165,7 @@ enum ParseOperation {
|
||||
MarkScriptAlreadyStarted(ParseNodeID),
|
||||
ReparentChildren(ParseNodeID, ParseNodeID),
|
||||
AssociateWithForm(ParseNodeID, ParseNodeID),
|
||||
CreatePI(ParseNodeID),
|
||||
CreatePI(ParseNodeID, StrTendril, StrTendril),
|
||||
Pop(ParseNodeID),
|
||||
}
|
||||
|
||||
@ -329,15 +325,11 @@ impl Sink {
|
||||
ParseOperation::Pop(node) => {
|
||||
vtable_for(self.get_node(&node)).pop();
|
||||
}
|
||||
ParseOperation::CreatePI(node) => {
|
||||
let pi;
|
||||
{
|
||||
let data = self.get_parse_node_data(&node);
|
||||
pi = ProcessingInstruction::new(
|
||||
DOMString::from(data.target.clone().unwrap()),
|
||||
DOMString::from(data.data.clone().unwrap()),
|
||||
ParseOperation::CreatePI(node, target, data) => {
|
||||
let pi = ProcessingInstruction::new(
|
||||
DOMString::from(String::from(target)),
|
||||
DOMString::from(String::from(data)),
|
||||
document);
|
||||
}
|
||||
self.insert_node(node, JS::from_ref(pi.upcast()));
|
||||
}
|
||||
}
|
||||
@ -411,12 +403,7 @@ impl TreeSink for Sink {
|
||||
|
||||
fn create_pi(&mut self, target: StrTendril, data: StrTendril) -> ParseNode {
|
||||
let node = self.new_parse_node();
|
||||
{
|
||||
let mut node_data = self.get_parse_node_data_mut(&node.id);
|
||||
node_data.target = Some(String::from(target));
|
||||
node_data.data = Some(String::from(data));
|
||||
}
|
||||
self.process_operation(ParseOperation::CreatePI(node.id));
|
||||
self.process_operation(ParseOperation::CreatePI(node.id, target, data));
|
||||
node
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user