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

Auto merge of #11850 - splav:box-shadow#11662, r=glennw

Browse source 
Fix PaintContext page_rect due to display list origin

Fix PaintContext page_rect due to non zero display list origin.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11662 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11850)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-27 18:54:32 -05:00 • committed by GitHub
commit abdf01ed05
4 changed files with 72 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/paint_thread.rs
View file

@ -684,7 +684,7 @@ impl WorkerThread {
let mut paint_context = PaintContext { let mut paint_context = PaintContext {
draw_target: draw_target.clone(), draw_target: draw_target.clone(),
font_context: &mut self.font_context, font_context: &mut self.font_context,
page_rect: Rect::from_untyped(&tile.page_rect), page_rect: Rect::from_untyped(&tile.page_rect.translate(&paint_layer.display_list_origin)),
screen_rect: Rect::from_untyped(&tile.screen_rect), screen_rect: Rect::from_untyped(&tile.screen_rect),
clip_rect: None, clip_rect: None,
transient_clip: None, transient_clip: None,

24
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -1032,6 +1032,18 @@
"url": "/_mozilla/css/box_shadow_blur_a.html" "url": "/_mozilla/css/box_shadow_blur_a.html"
} }
], ],
"css/box_shadow_blur_fixed.html": [
{
"path": "css/box_shadow_blur_fixed.html",
"references": [
[
"/_mozilla/css/box_shadow_blur_fixed_ref.html",
"=="
]
],
"url": "/_mozilla/css/box_shadow_blur_fixed.html"
}
],
"css/box_shadow_border_box_a.html": [ "css/box_shadow_border_box_a.html": [
{ {
"path": "css/box_shadow_border_box_a.html", "path": "css/box_shadow_border_box_a.html",
@ -10132,6 +10144,18 @@
"url": "/_mozilla/css/box_shadow_blur_a.html" "url": "/_mozilla/css/box_shadow_blur_a.html"
} }
], ],
"css/box_shadow_blur_fixed.html": [
{
"path": "css/box_shadow_blur_fixed.html",
"references": [
[
"/_mozilla/css/box_shadow_blur_fixed_ref.html",
"=="
]
],
"url": "/_mozilla/css/box_shadow_blur_fixed.html"
}
],
"css/box_shadow_border_box_a.html": [ "css/box_shadow_border_box_a.html": [
{ {
"path": "css/box_shadow_border_box_a.html", "path": "css/box_shadow_border_box_a.html",

24
tests/wpt/mozilla/tests/css/box_shadow_blur_fixed.html Normal file
View file

@ -0,0 +1,24 @@
<head>
<link rel='match' href='box_shadow_blur_fixed_ref.html'>
<style>
#div_outer {
width: 100%;
position: fixed;
top: 100px;
left: 0;
}
#div_inner {
background: lightgrey;
height: 40px;
box-shadow: 0 0 30px 30px darkblue;
}
</style>
</head>
<body>
<div id="div_outer">
<div id="div_inner">
</div>
</div>
</body>

23
tests/wpt/mozilla/tests/css/box_shadow_blur_fixed_ref.html Normal file
View file

@ -0,0 +1,23 @@
<head>
<style>
#div_outer {
width: 100%;
position: absolute;
top: 100px;
left: 0;
}
#div_inner {
background: lightgrey;
height: 40px;
box-shadow: 0 0 30px 30px darkblue;
}
</style>
</head>
<body>
<div id="div_outer">
<div id="div_inner">
</div>
</div>
</body>