diff options
12 files changed, 15 insertions, 23 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index d3e568b1076..12eb258f8f5 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -1352,7 +1352,7 @@ impl<'a> PostorderNodeMutTraversal for FlowConstructor<'a> { } }; - debug!("building flow for node: {:?} {:?} {:?}", display, float, node.type_id()); + debug!("building flow for node: {:?} {:?} {:?} {:?}", display, float, positioning, node.type_id()); // Switch on display and floatedness. match (display, float, positioning) { diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 6f33dd5be17..91cc9ddfb26 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1802,7 +1802,7 @@ impl Fragment { block_size_above_baseline: computed_block_size + self.border_padding.block_start_end(), depth_below_baseline: Au(0), - ascent: computed_block_size + self.border_padding.block_end, + ascent: computed_block_size + self.border_padding.block_start_end(), } } SpecificFragmentInfo::ScannedText(ref text_fragment) => { diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 8b1201ab2ac..786eb580f29 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -133,6 +133,7 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at == img_block_maxwidth_a.html img_block_maxwidth_ref.html == img_block_maxwidth_b.html img_block_maxwidth_ref.html == img_dynamic_remove.html img_dynamic_remove_ref.html +== img_padding_a.html img_padding_b.html != img_simple.html img_simple_ref.html == img_size_a.html img_size_b.html == img_width_attribute_intrinsic_width_a.html img_width_attribute_intrinsic_width_ref.html diff --git a/tests/ref/img_padding_a.html b/tests/ref/img_padding_a.html new file mode 100644 index 00000000000..96a42ffa03c --- /dev/null +++ b/tests/ref/img_padding_a.html @@ -0,0 +1,6 @@ +<!DOCTYPE html> +<html> + <body> + <img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black; position:relative; height: 206px; width: 206px; left:0px; top: 0px;'> + </body> +</html> diff --git a/tests/ref/img_padding_b.html b/tests/ref/img_padding_b.html new file mode 100644 index 00000000000..60893de6cae --- /dev/null +++ b/tests/ref/img_padding_b.html @@ -0,0 +1,6 @@ +<!DOCTYPE html> +<html> + <body> + <img src="../html/rust-0.png" style='padding-top: 100px; border: 1px solid black;'> + </body> +</html> diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-003.htm.ini deleted file mode 100644 index 0bf62966e84..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-003.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[absolute-non-replaced-max-height-003.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-011.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-011.htm.ini deleted file mode 100644 index 4dc8412026e..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/absolute-non-replaced-max-height-011.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[absolute-non-replaced-max-height-011.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/floats-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/floats-040.htm.ini deleted file mode 100644 index 848e242c15a..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/floats-040.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[floats-040.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-111.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-111.htm.ini deleted file mode 100644 index 77f0d773074..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/min-height-111.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[min-height-111.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/min-height-112.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/min-height-112.htm.ini deleted file mode 100644 index 0272b02fd57..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/min-height-112.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[min-height-112.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/position-absolute-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/position-absolute-002.htm.ini deleted file mode 100644 index 9481a74aad0..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/position-absolute-002.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[position-absolute-002.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/top-offset-percentage-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/top-offset-percentage-001.htm.ini deleted file mode 100644 index 1f10ea36b41..00000000000 --- a/tests/wpt/metadata-css/css21_dev/html4/top-offset-percentage-001.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[top-offset-percentage-001.htm] - type: reftest - expected: FAIL |