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

bors-servo · bors-servo · commit e68bd8d4ffc7 · 2015-09-28T18:57:08.000-06:00
Use the correct container size in compute_overflow Fixes #7768 - positioning of RTL stacking contexts. r? @pcwalton  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7771)
diff --git a/components/layout/block.rs b/components/layout/block.rs
@@ -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,
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
@@ -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.
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
@@ -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
     }
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -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
-}
+}
diff --git a/tests/wpt/mozilla/tests/css/stacking_context_rtl-ref.html b/tests/wpt/mozilla/tests/css/stacking_context_rtl-ref.html
@@ -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>
diff --git a/tests/wpt/mozilla/tests/css/stacking_context_rtl.html b/tests/wpt/mozilla/tests/css/stacking_context_rtl.html
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -2126,9 +2126,10 @@ impl Flow for BlockFlow {`
`2126`	`2126`	`}`
`2127`	`2127`
`2128`	`2128`	`fn compute_overflow(&self) -> Rect<Au> {`
`2129`		`- self.fragment.compute_overflow(&self.base`
`2130`		`- .early_absolute_position_info`
`2131`		`- .relative_containing_block_size)`
	`2129`	`+ self.fragment.compute_overflow(&self.base.early_absolute_position_info`
	`2130`	`+ .relative_containing_block_size,`
	`2131`	`+ self.base.early_absolute_position_info`
	`2132`	`+ .relative_containing_block_mode)`
`2132`	`2133`	`}`
`2133`	`2134`
`2134`	`2135`	`fn iterate_through_fragment_border_boxes(&self,`
Original file line number	Diff line number	Diff line change
`@@ -1775,7 +1775,8 @@ impl Flow for InlineFlow {`
`1775`	`1775`	`let mut overflow = ZERO_RECT;`
`1776`	`1776`	`for fragment in &self.fragments.fragments {`
`1777`	`1777`	`overflow = overflow.union(&fragment.compute_overflow(`
`1778`		`- &self.base.early_absolute_position_info.relative_containing_block_size))`
	`1778`	`+ &self.base.early_absolute_position_info.relative_containing_block_size,`
	`1779`	`+ self.base.early_absolute_position_info.relative_containing_block_mode));`
`1779`	`1780`	`}`
`1780`	`1781`	`overflow`
`1781`	`1782`	`}`