Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Layout viewer for layout 2020 #25803

Merged
merged 10 commits into from Feb 24, 2020

Display fragment tree on layout viewer

  • Loading branch information
ferjm committed Feb 21, 2020
commit 84dd334160ad51b623c42cf637892709ce348de0
@@ -100,22 +100,23 @@ <h1> Servo Layout Viewer </h1>
}

function create_flow_tree(trace_node) {
var base = get_base(trace_node);

var node = {
text: trace_node.class + " (" + base.id + ")",
id: base.id,
icon: "dummy",
href: "#diff-" + base.id
text: Object.keys(trace_node)[0],
// id: base.id,
// icon: "dummy",
// href: "#diff-" + base.id

This comment has been minimized.

Copy link
@SimonSapin

SimonSapin Feb 20, 2020

Member

Here and in three other places, prefer removing code rather than leaving it commented out. Git history still has it.

This comment has been minimized.

Copy link
@ferjm

ferjm Feb 21, 2020

Author Member

Yes, this was uncommented on a later commit. Sorry about that

};

var children = [];
for (var i=0 ; i < base.children.length ; ++i) {
children.push(create_flow_tree(base.children[i]));
}
var fragment = Object.values(trace_node)[0];
if (fragment.children) {
var children = [];
for (var i=0 ; i < fragment.children.length ; ++i) {
children.push(create_flow_tree(fragment.children[i]));
}

if (children.length > 0) {
node.nodes = children;
if (children.length > 0) {
node.nodes = children;
}
}

return node;
@@ -125,22 +126,22 @@ <h1> Servo Layout Viewer </h1>
var base = get_base(trace_node);
flow_hash[base.id] = trace_node;

for (var i=0 ; i < base.children.length ; ++i) {
for (var i=0 ; i < trace_node.children.length ; ++i) {
create_flow_hash(base.children[i], flow_hash);
}

delete base.children;
delete trace_node.children;
}

function flatten_trace(trace_node) {
var flow_tree = create_flow_tree(trace_node.children[0]);
var flow_tree = create_flow_tree(Object.values(trace_node)[0]);

var flow_hash = {};
create_flow_hash(trace_node.children[0], flow_hash);
//var flow_hash = {};
//create_flow_hash(trace_node[0], flow_hash);

return {
tree: flow_tree,
flows: flow_hash,
//flows: flow_hash,
}
}

@@ -149,21 +150,23 @@ <h1> Servo Layout Viewer </h1>
var post_trace = flatten_trace(trace_node.post);

var tree_node = {
text: trace_node.name,
text: Object.keys(trace_node)[0],
icon: "dummy",
flow_tree: pre_trace.tree, // assume pre/post trace always have same tree!
pre: pre_trace.flows,
post: post_trace.flows,
//pre: pre_trace.flows,
//post: post_trace.flows,
};

var children = [];

for (var i=0 ; i < trace_node.children.length ; ++i) {
children.push(create_tree_node(trace_node.children[i]));
}
var trace_node = Object.values(trace_node)[0];
if (trace_node.children) {
var children = [];
for (var i=0 ; i < trace_node.children.length ; ++i) {
children.push(create_tree_node(trace_node.children[i]));
}

if (children.length > 0) {
tree_node.nodes = children;
if (children.length > 0) {
tree_node.nodes = children;
}
}

return tree_node;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.