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

Fixes the problem with canvas not being rendered when displayed as block level elements

Browse source
This commit is contained in:
Diego Marcos 2015-03-15 03:02:33 -07:00
parent 389338c28f
commit cd84ab2ddc
4 changed files with 57 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/block.rs
View file

@ -732,11 +732,15 @@ impl BlockFlow {
/// Return true if this has a replaced fragment. /// Return true if this has a replaced fragment.
/// ///
/// The only two types of replaced fragments currently are text fragments /// Text, Images, Inline Block and
/// and image fragments. // Canvas (https://html.spec.whatwg.org/multipage/rendering.html#replaced-elements)
// fragments are considered as replaced fragments
fn is_replaced_content(&self) -> bool { fn is_replaced_content(&self) -> bool {
match self.fragment.specific { match self.fragment.specific {
SpecificFragmentInfo::ScannedText(_) | SpecificFragmentInfo::Image(_) | SpecificFragmentInfo::InlineBlock(_) => true, SpecificFragmentInfo::ScannedText(_) |
SpecificFragmentInfo::Image(_) |
SpecificFragmentInfo::Canvas(_) |
SpecificFragmentInfo::InlineBlock(_) => true,
_ => false, _ => false,
} }
} }

1
tests/ref/basic.list
View file

@ -64,6 +64,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== box_sizing_border_box_a.html box_sizing_border_box_ref.html == box_sizing_border_box_a.html box_sizing_border_box_ref.html
== box_sizing_sanity_check_a.html box_sizing_sanity_check_ref.html == box_sizing_sanity_check_a.html box_sizing_sanity_check_ref.html
== br.html br-ref.html == br.html br-ref.html
== canvas_as_block_element_a.html canvas_as_block_element_ref.html
== canvas_lineto_a.html canvas_lineto_ref.html == canvas_lineto_a.html canvas_lineto_ref.html
== canvas_transform_a.html canvas_transform_ref.html == canvas_transform_a.html canvas_transform_ref.html
== case-insensitive-font-family.html case-insensitive-font-family-ref.html == case-insensitive-font-family.html case-insensitive-font-family-ref.html

31
tests/ref/canvas_as_block_element_a.html Normal file
View file

@ -0,0 +1,31 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
html, body {
margin: 0;
padding: 0;
}
canvas {
display: block;
}
</style>
</head>
<body>
<title>Canvas is displayed as a block-level element</title>
<canvas id="c"></canvas>
<script>
var canvas = document.getElementById('c');
canvas.width = 100;
canvas.height = 100;
var ctx = canvas.getContext('2d');
ctx.fillStyle = '#ff0000';
ctx.fillRect(0, 0, 100, 100);
</script>
</body>
</html>

18
tests/ref/canvas_as_block_element_ref.html Normal file
View file

@ -0,0 +1,18 @@
<html>
<head>
<style>
html, body {
margin: 0;
padding: 0;
}
div {
background: #ff0000;
width: 100px;
height: 100px;
}
</style>
</head>
<body>
<div></div>
</body>
</html>