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

Auto merge of #7771 - mbrubeck:rtl-stacking-context, r=pcwalton

Browse source 
Use the correct container size in compute_overflow

Fixes #7768 - positioning of RTL stacking contexts. r? @pcwalton

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7771)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-28 18:57:08 -06:00
commit e68bd8d4ff
6 changed files with 61 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout/block.rs
View file

@ -2126,9 +2126,10 @@ impl Flow for BlockFlow {
}
fn compute_overflow(&self) -> Rect<Au> {
self.fragment.compute_overflow(&self.base
.early_absolute_position_info
.relative_containing_block_size)
self.fragment.compute_overflow(&self.base.early_absolute_position_info
.relative_containing_block_size,
self.base.early_absolute_position_info
.relative_containing_block_mode)
}
fn iterate_through_fragment_border_boxes(&self,

9
components/layout/fragment.rs
View file

@ -2160,9 +2160,12 @@ impl Fragment {
}
/// Computes the overflow rect of this fragment relative to the start of the flow.
pub fn compute_overflow(&self, relative_containing_block_size: &LogicalSize<Au>) -> Rect<Au> {
// FIXME(pcwalton, #2795): Get the real container size.
let container_size = Size2D::zero();
pub fn compute_overflow(&self,
relative_containing_block_size: &LogicalSize<Au>,
relative_containing_block_mode: WritingMode)
-> Rect<Au> {
let container_size =
relative_containing_block_size.to_physical(relative_containing_block_mode);
let mut border_box = self.border_box.to_physical(self.style.writing_mode, container_size);
// Relative position can cause us to draw outside our border box.

3
components/layout/inline.rs
View file

@ -1775,7 +1775,8 @@ impl Flow for InlineFlow {
let mut overflow = ZERO_RECT;
for fragment in &self.fragments.fragments {
overflow = overflow.union(&fragment.compute_overflow(
&self.base.early_absolute_position_info.relative_containing_block_size))
&self.base.early_absolute_position_info.relative_containing_block_size,
self.base.early_absolute_position_info.relative_containing_block_mode));
}
overflow
}

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

@ -111,6 +111,18 @@
"url": "/_mozilla/css/setpropertypriority.html"
}
],
"css/stacking_context_rtl.html": [
{
"path": "css/stacking_context_rtl.html",
"references": [
[
"/_mozilla/css/stacking_context_rtl-ref.html",
"=="
]
],
"url": "/_mozilla/css/stacking_context_rtl.html"
}
],
"css/word-spacing.html": [
{
"path": "css/word-spacing.html",
@ -1118,4 +1130,4 @@
"rev": null,
"url_base": "/_mozilla/",
"version": 2
}
}

16
tests/wpt/mozilla/tests/css/stacking_context_rtl-ref.html Normal file
View file

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<style>
div {
background: green;
height: 100px;
}
</style>
</head>
<body>
Test passes if there is a green rectangle below.
<div></div>
</body>
</html>

20
tests/wpt/mozilla/tests/css/stacking_context_rtl.html Normal file
View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel=match href="stacking_context_rtl-ref.html">
<style>
div {
background: green;
height: 100px;
direction: rtl;
position: relative;
z-index: 0;
}
</style>
</head>
<body>
Test passes if there is a green rectangle below.
<div></div>
</body>
</html>