servo · bors-servo · Mar 24, 2017 · Mar 17, 2017
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
@@ -2114,6 +2114,21 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
         }
     }
 
+    {
+        use computed_values::display::T as display;
+        // CSS writing modes spec (https://drafts.csswg.org/css-writing-modes-3/#block-flow):
+        //
+        //  If a box has a different writing-mode value than its containing block:
+        //  - If the box has a specified display of inline, its display computes to inline-block. [CSS21]
+        //
+        // www-style mail regarding above spec: https://lists.w3.org/Archives/Public/www-style/2017Mar/0045.html
+        // See https://github.com/servo/servo/issues/15754
+        if context.layout_parent_style.writing_mode != style.writing_mode &&
+           style.get_box().clone_display() == display::inline {
+            style.mutate_box().set_display(display::inline_block);
+        }
+    }
+
     {
         use computed_values::overflow_x::T as overflow;
         use computed_values::overflow_y;

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -11142,6 +11142,12 @@
      {}
     ]
    ],
+   "css/writing-mode_change_display.html": [
+    [
+     "/_mozilla/css/writing-mode_change_display.html",
+     {}
+    ]
+   ],
    "mozilla/DOMParser.html": [
     [
      "/_mozilla/mozilla/DOMParser.html",

    "b16bf3e07cb3c45f7d630ca35bae1012d38d1b6b",
    "support"
   ],
+  "css/writing-mode_change_display.html": [
+   "9ac1f9756a4cd44196242beb80621b9bc8cbe2ff",
+   "testharness"
+  ],
   "mozilla/2x2.png": [
    "c67d3f646e86413722833d2308a9bfc793a916bf",
    "support"
diff --git a/tests/wpt/mozilla/meta/css/writing-mode_change_display.html.ini b/tests/wpt/mozilla/meta/css/writing-mode_change_display.html.ini
@@ -0,0 +1 @@
+prefs: [layout.writing-mode.enabled:true]
diff --git a/tests/wpt/mozilla/tests/css/writing-mode_change_display.html b/tests/wpt/mozilla/tests/css/writing-mode_change_display.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>writing-mode test</title>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+</head>
+<body>
+  <div>
+    <span style="writing-mode: vertical-rl; border: 20px solid green">Text</span>
+  </div>
+
+  <script>
+    test(function() {
+      assert_equals(getComputedStyle(document.querySelector("span")).display, "inline-block");
+    }, "The span's `display` should change from `inline` to `inline-block`, because of its writing-mode.");
+  </script>
+</body>
+</html>