Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Parse unknown HTML elements into something sane

Browse source
This commit is contained in:
Patrick Walton 2012-05-24 13:57:50 -07:00
parent 02a20258d9
commit f5236ef7e3
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/servo/dom/base.rs
View file

@ -24,6 +24,7 @@ class element {
} }
enum element_subclass { enum element_subclass {
es_unknown,
es_div, es_div,
es_img(size<au>) es_img(size<au>)
} }

1
src/servo/layout/box_builder.rs
View file

@ -124,6 +124,7 @@ impl box_builder_priv for node {
alt *element.subclass { alt *element.subclass {
es_div { bk_block } es_div { bk_block }
es_img(size) { bk_intrinsic(@size) } es_img(size) { bk_intrinsic(@size) }
es_unknown { bk_inline }
} }
} }
} }

2
src/servo/layout/inline.rs
View file

@ -29,7 +29,7 @@ impl inline_layout_methods for @box {
self.bounds.size = { mut width: available_width, self.bounds.size = { mut width: available_width,
mut height: au(current_height) }; mut height: au(current_height) };
#debug["reflow_inline root=%? size=%?", self, self.bounds]; #debug["reflow_inline size=%?", self.bounds];
} }
} }

2
src/servo/layout/style/style.rs
View file

@ -24,6 +24,7 @@ fn default_style_for_node_kind(kind: node_kind) -> computed_style {
alt *element.subclass { alt *element.subclass {
es_div { computed_style({ mut display: di_block }) } es_div { computed_style({ mut display: di_block }) }
es_img(*) { computed_style({ mut display: di_inline }) } es_img(*) { computed_style({ mut display: di_inline }) }
es_unknown { computed_style({ mut display: di_inline }) }
} }
} }
} }
@ -42,7 +43,6 @@ impl style_priv for node {
default_style_for_node_kind(self.rd { |n| *n.kind }); default_style_for_node_kind(self.rd { |n| *n.kind });
#debug("recomputing style; parent node:"); #debug("recomputing style; parent node:");
self.dump();
let the_layout_data = @layout_data({ let the_layout_data = @layout_data({
mut computed_style: default_style, mut computed_style: default_style,

12
src/servo/parser/html_builder.rs
View file

@ -1,8 +1,8 @@
#[doc="Constructs a DOM tree from an incoming token stream."] #[doc="Constructs a DOM tree from an incoming token stream."]
import dom::rcu::writer_methods; import dom::rcu::writer_methods;
import dom::base::{element, es_div, es_img, methods, nk_element, nk_text}; import dom::base::{element, es_div, es_img, es_unknown, methods, nk_element};
import dom::base::{rd_tree_ops, wr_tree_ops}; import dom::base::{nk_text, rd_tree_ops, wr_tree_ops};
import dom = dom::base; import dom = dom::base;
import parser = parser::html; import parser = parser::html;
import html::token; import html::token;
@ -29,7 +29,7 @@ fn link_up_attribute(scope: dom::node_scope, node: dom::node, key: str,
some(s) { dimensions.height = geom::px_to_au(s); } some(s) { dimensions.height = geom::px_to_au(s); }
} }
} }
es_div | es_img(*) { es_div | es_img(*) | es_unknown {
// Drop on the floor. // Drop on the floor.
} }
} }
@ -67,7 +67,11 @@ fn build_dom(scope: dom::node_scope,
cur = new_node; cur = new_node;
} }
parser::to_start_opening_tag(t) { parser::to_start_opening_tag(t) {
fail ("Unrecognized tag: " + t); #debug["unknown element: %s", t];
let new_node =
scope.new_node(dom::nk_element(element(t, ~es_unknown)));
scope.add_child(cur, new_node);
cur = new_node;
} }
parser::to_attr(key, value) { parser::to_attr(key, value) {
#debug["attr: %? = %?", key, value]; #debug["attr: %? = %?", key, value];