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

Auto merge of #7161 - mbrubeck:underline, r=pcwalton

Browse source 
Snap rectangles to nearest pixels consistently.

Snapping the top-left and bottom-right corners separately can cause a rectangle to change size or even become empty when offset by a subpixel amount.  Instead, this patch snaps the top-left corner, then snaps the size to a whole pixel amount, so any rectangle of a given original size will always have the same snapped size.

Fixes #7152. r? @pcwalton or @glennw

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7161)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-11 11:31:32 -06:00
commit 9c528c6382
5 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/gfx/paint_context.rs
View file

@ -1171,16 +1171,10 @@ pub trait ToAzureRect {
impl ToAzureRect for Rect<Au> {
fn to_nearest_azure_rect(&self) -> Rect<AzFloat> {
let top_left = self.origin.to_nearest_azure_point();
let bottom_right = self.bottom_right().to_nearest_azure_point();
Rect::new(top_left,
Size2D::new((bottom_right.x - top_left.x) as AzFloat,
(bottom_right.y - top_left.y) as AzFloat))
Rect::new(self.origin.to_nearest_azure_point(), self.size.to_nearest_azure_size())
}
fn to_azure_rect(&self) -> Rect<AzFloat> {
Rect::new(self.origin.to_azure_point(), Size2D::new(self.size.width.to_f32_px(),
self.size.height.to_f32_px()))
Rect::new(self.origin.to_azure_point(), self.size.to_azure_size())
}
}
@ -1382,11 +1376,12 @@ impl DrawTargetExtensions for DrawTarget {
}
fn create_rectangular_path(&self, rect: &Rect<Au>) -> Path {
let rect = rect.to_nearest_azure_rect();
let path_builder = self.create_path_builder();
path_builder.move_to(rect.origin.to_nearest_azure_point());
path_builder.line_to(Point2D::new(rect.max_x(), rect.origin.y).to_nearest_azure_point());
path_builder.line_to(Point2D::new(rect.max_x(), rect.max_y()).to_nearest_azure_point());
path_builder.line_to(Point2D::new(rect.origin.x, rect.max_y()).to_nearest_azure_point());
path_builder.move_to(rect.origin);
path_builder.line_to(Point2D::new(rect.max_x(), rect.origin.y));
path_builder.line_to(Point2D::new(rect.max_x(), rect.max_y()));
path_builder.line_to(Point2D::new(rect.origin.x, rect.max_y()));
path_builder.finish()
}
}

1
tests/ref/basic.list
View file

@ -315,6 +315,7 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
== text_decoration_cached.html text_decoration_cached_ref.html
# text_decoration_propagation_a.html text_decoration_propagation_b.html
!= text_decoration_smoke_a.html text_decoration_smoke_ref.html
!= text_decoration_underline_subpx_a.html text_decoration_underline_subpx_ref.html
== text_indent_a.html text_indent_ref.html
== text_justify_none_a.html text_justify_none_ref.html
!= text_overflow_a.html text_overflow_ref.html

16
tests/ref/text_decoration_underline_subpx_a.html Normal file
View file

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Underline test</title>
<style>
p {
font: 14px "Times New Roman";
text-decoration: underline;
}
</style>
</head>
<body>
<p>Hello</p>
</body>
</html>

15
tests/ref/text_decoration_underline_subpx_ref.html Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Underline test</title>
<style>
p {
font: 14px "Times New Roman";
}
</style>
</head>
<body>
<p>Hello</p>
</body>
</html>

3
tests/wpt/metadata-css/css21_dev/html4/position-relative-035.htm.ini
View file

@ -1,3 +1,4 @@
[position-relative-035.htm]
type: reftest
expected: FAIL
expected:
if os == "mac": FAIL