Fix wrong calculation of inline element's block size

servo · Aug 22, 2016 · a14f6cb · a14f6cb
1 parent 4e7c689
commit a14f6cb
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 44 deletions.
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
@@ -2008,10 +2008,8 @@ impl Fragment {
                 let font_derived_metrics =
                     InlineMetrics::from_font_metrics(&info.run.font_metrics, line_height);
                 InlineMetrics {
-                    block_size_above_baseline: font_derived_metrics.block_size_above_baseline +
-                                                   self.border_padding.block_start,
-                    depth_below_baseline: font_derived_metrics.depth_below_baseline +
-                        self.border_padding.block_end,
+                    block_size_above_baseline: font_derived_metrics.block_size_above_baseline,
+                    depth_below_baseline: font_derived_metrics.depth_below_baseline,
                     ascent: font_derived_metrics.ascent + self.border_padding.block_start,
                 }
             }

diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-001.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-002.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-padding-bleed-003.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/border-width-applies-to-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/border-width-applies-to-008.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5506-ipadn-t-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5506-ipadn-t-000.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5506-ipadn-t-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5506-ipadn-t-002.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5508-ipadn-b-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5508-ipadn-b-000.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/c5510-ipadn-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/c5510-ipadn-000.htm.ini
@@ -1,3 +1,4 @@
 [c5510-ipadn-000.htm]
   type: reftest
-  expected: FAIL
+  expected:
+    if os != "mac": FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-022.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-022.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-non-replaced-height-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-non-replaced-height-002.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-non-replaced-height-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-non-replaced-height-003.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-bottom-applies-to-008.htm.ini
diff --git a/tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/margin-top-applies-to-008.htm.ini
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2616,6 +2616,18 @@
             "url": "/_mozilla/css/inline_element_border_a.html"
           }
         ],
+        "css/inline_element_padding_margin.html": [
+          {
+            "path": "css/inline_element_padding_margin.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_element_padding_margin_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_element_padding_margin.html"
+          }
+        ],
         "css/inline_font_size_zero_a.html": [
           {
             "path": "css/inline_font_size_zero_a.html",
@@ -11872,6 +11884,18 @@
           "url": "/_mozilla/css/inline_element_border_a.html"
         }
       ],
+      "css/inline_element_padding_margin.html": [
+        {
+          "path": "css/inline_element_padding_margin.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_element_padding_margin_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_element_padding_margin.html"
+        }
+      ],
       "css/inline_font_size_zero_a.html": [
         {
           "path": "css/inline_font_size_zero_a.html",

diff --git a/tests/wpt/mozilla/tests/css/inline_element_padding_margin.html b/tests/wpt/mozilla/tests/css/inline_element_padding_margin.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Border, padding and margin properties' top and bottom values of inline elements shouldn't affect element's height</title>
+    <link rel="match" href="inline_element_padding_margin_ref.html">
+    <style>
+        a {
+            border-top: 20px solid transparent;
+            border-bottom: 20px solid transparent;
+            padding: 20px 0;
+            margin: 20px 0;
+        }
+    </style>
+</head>
+<body>
+    <a href="#">foo</a>
+    <br>
+    bar
+</body>
+</html>
diff --git a/tests/wpt/mozilla/tests/css/inline_element_padding_margin_ref.html b/tests/wpt/mozilla/tests/css/inline_element_padding_margin_ref.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Border, padding and margin properties' top and bottom values of inline elements shouldn't affect element's height</title>
+</head>
+<body>
+    <a href="#">foo</a>
+    <br>
+    bar
+</body>
+</html>