WebKit
diff --git a/‎LayoutTests/ChangeLog
Lines changed: 253 additions & 0 deletions b/‎LayoutTests/ChangeLog
Lines changed: 253 additions & 0 deletions
diff --git a/‎LayoutTests/TestExpectations
Lines changed: 11 additions & 0 deletions b/‎LayoutTests/TestExpectations
Lines changed: 11 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/ChangeLog
Lines changed: 246 additions & 0 deletions b/‎LayoutTests/imported/w3c/ChangeLog
Lines changed: 246 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/resources/import-expectations.json
Lines changed: 1 addition & 0 deletions b/‎LayoutTests/imported/w3c/resources/import-expectations.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/resources/resource-files.json
Lines changed: 2 additions & 0 deletions b/‎LayoutTests/imported/w3c/resources/resource-files.json
Lines changed: 2 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html
Lines changed: 64 additions & 0 deletions b/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-001.tentative.html
Lines changed: 64 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html
Lines changed: 39 additions & 39 deletions b/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html
Lines changed: 39 additions & 39 deletions
diff --git a/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-expected.html
Lines changed: 25 additions & 0 deletions b/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative-expected.html
Lines changed: 25 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html
Lines changed: 29 additions & 0 deletions b/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-003.tentative.html
Lines changed: 29 additions & 0 deletions
diff --git a/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html
Lines changed: 7 additions & 7 deletions b/‎LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html
Lines changed: 7 additions & 7 deletions
@@ -1288,6 +1288,17 @@ imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-auto.ht
 imported/w3c/web-platform-tests/mathml/relations/css-styling/mathvariant-case-sensitivity.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/mathml/relations/css-styling/padding-border-margin/padding-border-margin-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html [ Pass Failure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-2.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/fractions/frac-invalid-3.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/mrow/legacy-mfenced-element-001.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/radicals/dynamic-radical-paint-invalidation-001.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/scripts/subsup-legacy-scriptshift-attributes-001.tentative.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-form-minus-plus.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-form.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/presentation-markup/operators/mo-single-char-and-children.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/relations/css-styling/clip.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/relations/css-styling/presentational-hints-001.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/mathml/relations/css-styling/transform.html [ ImageOnlyFailure ]
 
 # This MathML test should be rewritten.
 webkit.org/b/201356 mathml/presentation/stretchy-depth-height-symmetric.html [ Skip ]
 
@@ -93,6 +93,7 @@
     "web-platform-tests/css/css-flexbox": "import", 
     "web-platform-tests/css/css-font-loading": "import", 
     "web-platform-tests/css/css-fonts": "import", 
+    "web-platform-tests/css/css-fonts/math-script-level-and-math-style/": "import", 
     "web-platform-tests/css/css-grid": "import", 
     "web-platform-tests/css/css-grid/abspos": "import", 
     "web-platform-tests/css/css-grid/alignment/": "import", 
 
@@ -2545,6 +2545,8 @@
         "web-platform-tests/infrastructure/assumptions/ahem-notref.html",
         "web-platform-tests/infrastructure/reftest/red.html",
         "web-platform-tests/intersection-observer/observer-in-iframe.html",
+        "web-platform-tests/mathml/crashtests/display-and-column-properties.html",
+        "web-platform-tests/mathml/crashtests/multicol-on-token-elements.html",
         "web-platform-tests/mathml/presentation-markup/fractions/frac-color-001-notref.html",
         "web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html",
         "web-platform-tests/mathml/relations/css-styling/mathbackground-001-notref.html",
 
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>math-depth</title>
+    <meta charset="utf-8">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-math-script-level-property">
+    <meta name="assert" content="Check the computed value of math-depth">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      function mathDepth(id) {
+          return window.getComputedStyle(document.getElementById(id)).
+              getPropertyValue("math-depth");
+      }
+      setup({ explicit_done: true });
+      window.addEventListener("load", function() {
+          test(function() {
+              assert_equals(mathDepth("initial"), "0");
+              assert_equals(mathDepth("initialFrom11"), "0");
+          }, "Initial value of math-depth");
+          test(function() {
+              assert_equals(mathDepth("inherited11"), "11");
+              assert_equals(mathDepth("inherited-7"), "-7");
+          }, "Inherited values of math-depth");
+          test(function() {
+              assert_equals(mathDepth("inherited9specifiedAutoInline"), "10");
+              assert_equals(mathDepth("inherited9specifiedAutoDisplay"), "9");
+          }, "Specified math-depth: auto-add");
+          test(function() {
+              assert_equals(mathDepth("specified11"), "11");
+              assert_equals(mathDepth("specified-7"), "-7");
+          }, "Specified math-depth: <integer>");
+          test(function() {
+              assert_equals(mathDepth("specifiedAdd10From5"), "15");
+              assert_equals(mathDepth("specifiedAdd-15From5"), "-10");
+          }, "Specified math-depth: add(<integer>)");
+          done();
+      });
+    </script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <div id="initial"></div>
+    <div id="specified11" style="math-depth: 11">
+      <div id="initialFrom11" style="math-depth: initial"></div>
+      <div id="inherited11"></div>
+    </div>
+    <div id="specified-7" style="math-depth: -7">
+      <div id="inherited-7"></div>
+    </div>
+    <div style="math-depth: 9">
+      <div style="math-style: compact">
+        <div id="inherited9specifiedAutoInline" style="math-depth: auto-add" ></div>
+      </div>
+      <div style="math-style: normal">
+        <div id="inherited9specifiedAutoDisplay" style="math-depth: auto-add" ></div>
+      </div>
+    </div>
+    <div style="math-depth: 5">
+      <div id="specifiedAdd10From5" style="math-depth: add(10)"></div>
+      <div id="specifiedAdd-15From5" style="math-depth: add(-15)"></div>
+    </div>
+  </body>
+</html>
@@ -6,7 +6,7 @@
     <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/3746">
     <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-math-script-level-property">
     <link rel="help" href="https://www.w3.org/TR/cssom-1/#serialize-a-css-component-value">
-    <meta name="assert" content="Verify effect of font-size: scriptlevel(auto) | scriptlevel(add(<integer>)) | scriptlevel(<integer>), starting from different values of math-script-level.">
+    <meta name="assert" content="Verify effect of math-depth: auto-add | add(<integer) | (<integer>, starting from different values of math-depth.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
@@ -80,112 +80,112 @@
     <div>
       <div class="container">
         <div>
-          <div style="font-size: 200px; math-style: display">
-            <div id="autoDisplay" style="font-size: scriptlevel(auto)"></div>
+          <div style="font-size: 200px; math-style: normal">
+            <div id="autoDisplay" style="font-size: math; math-depth: auto-add"></div>
           </div>
-          <div style="font-size: 500px; math-style: inline">
-            <div id="autoInline" style="font-size: scriptlevel(auto)"></div>
+          <div style="font-size: 500px; math-style: compact">
+            <div id="autoInline" style="font-size: math; math-depth: auto-add"></div>
           </div>
         </div>
         <div style="font-size: 2000px;">
-          <div style="math-style: display; font-size: scriptlevel(7)">
-            <div id="autoDisplayFrom7" style="font-size: scriptlevel(auto)"></div>
+          <div style="math-style: normal; font-size: math; math-depth: 7">
+            <div id="autoDisplayFrom7" style="font-size: math; math-depth: auto-add"></div>
           </div>
-          <div style="math-style: inline; font-size: scriptlevel(7)">
-            <div id="autoInlineFrom7" style="font-size: scriptlevel(auto)"></div>
+          <div style="math-style: compact; font-size: math; math-depth: 7">
+            <div id="autoInlineFrom7" style="font-size: math; math-depth: auto-add"></div>
           </div>
         </div>
         <div>
           <div style="font-size: 200px">
-            <div id="add0" style="font-size: scriptlevel(add(0))"></div>
+            <div id="add0" style="font-size: math; math-depth: add(0)"></div>
           </div>
           <div style="font-size: 71px">
-            <div id="add-1" style="font-size: scriptlevel(add(-1))"></div>
+            <div id="add-1" style="font-size: math; math-depth: add(-1)"></div>
           </div>
           <div style="font-size: 500px">
-            <div id="add1" style="font-size: scriptlevel(add(1))"></div>
+            <div id="add1" style="font-size: math; math-depth: add(1)"></div>
           </div>
           <div style="font-size: 200px">
-            <div id="add-2" style="font-size: scriptlevel(add(-2))"></div>
+            <div id="add-2" style="font-size: math; math-depth: add(-2)"></div>
           </div>
           <div style="font-size: 1000px">
-            <div id="add2" style="font-size: scriptlevel(add(2))"></div>
+            <div id="add2" style="font-size: math; math-depth: add(2)"></div>
           </div>
           <div style="font-size: 30px">
-            <div id="add-9" style="font-size: scriptlevel(add(-9))"></div>
+            <div id="add-9" style="font-size: math; math-depth: add(-9)"></div>
           </div>
           <div style="font-size: 2000px">
-            <div id="add9" style="font-size: scriptlevel(add(9))"></div>
+            <div id="add9" style="font-size: math; math-depth: add(9)"></div>
           </div>
         </div>
-        <div style="font-size: scriptlevel(3);">
+        <div style="math-depth: 3;">
           <div style="font-size: 200px;">
-            <div id="add0from3" style="font-size: scriptlevel(add(0))"></div>
+            <div id="add0from3" style="font-size: math; math-depth: add(0)"></div>
           </div>
           <div style="font-size: 71px;">
-            <div id="add-1from3" style="font-size: scriptlevel(add(-1))"></div>
+            <div id="add-1from3" style="font-size: math; math-depth: add(-1)"></div>
           </div>
           <div style="font-size: 500px;">
-            <div id="add1from3" style="font-size: scriptlevel(add(1))"></div>
+            <div id="add1from3" style="font-size: math; math-depth: add(1)"></div>
           </div>
           <div style="font-size: 200px;">
-            <div id="add-2from3" style="font-size: scriptlevel(add(-2))"></div>
+            <div id="add-2from3" style="font-size: math; math-depth: add(-2)"></div>
           </div>
           <div style="font-size: 1000px;">
-            <div id="add2from3" style="font-size: scriptlevel(add(2))"></div>
+            <div id="add2from3" style="font-size: math; math-depth: add(2)"></div>
           </div>
           <div style="font-size: 30px;">
-            <div id="add-9from3" style="font-size: scriptlevel(add(-9))"></div>
+            <div id="add-9from3" style="font-size: math; math-depth: add(-9)"></div>
           </div>
           <div style="font-size: 2000px;">
-            <div id="add9from3" style="font-size: scriptlevel(add(9))"></div>
+            <div id="add9from3" style="font-size: math; math-depth: add(9)"></div>
           </div>
         </div>
         <div>
           <div style="font-size: 200px">
-            <div id="set0" style="font-size: scriptlevel(0)"></div>
+            <div id="set0" style="font-size: math; math-depth: 0"></div>
           </div>
           <div style="font-size: 71px">
-            <div id="set-1" style="font-size: scriptlevel(-1)"></div>
+            <div id="set-1" style="font-size: math; math-depth: -1"></div>
           </div>
           <div style="font-size: 500px">
-            <div id="set1" style="font-size: scriptlevel(1)"></div>
+            <div id="set1" style="font-size: math; math-depth: 1"></div>
           </div>
           <div style="font-size: 200px">
-            <div id="set-2" style="font-size: scriptlevel(-2)"></div>
+            <div id="set-2" style="font-size: math; math-depth: -2"></div>
           </div>
           <div style="font-size: 1000px">
-            <div id="set2" style="font-size: scriptlevel(2)"></div>
+            <div id="set2" style="font-size: math; math-depth: 2"></div>
           </div>
           <div style="font-size: 30px">
-            <div id="set-9" style="font-size: scriptlevel(-9)"></div>
+            <div id="set-9" style="font-size: math; math-depth: -9"></div>
           </div>
           <div style="font-size: 2000px">
-            <div id="set9" style="font-size: scriptlevel(9)"></div>
+            <div id="set9" style="font-size: math; math-depth: 9"></div>
           </div>
         </div>
       </div>
-        <div style="font-size: scriptlevel(50)">
+        <div style="math-depth: 50">
           <div style="font-size: 200px;">
-            <div id="set50" style="font-size: scriptlevel(50)"></div>
+            <div id="set50" style="font-size: math; math-depth: 50"></div>
           </div>
           <div style="font-size: 71px;">
-            <div id="set49" style="font-size: scriptlevel(49)"></div>
+            <div id="set49" style="font-size: math; math-depth: 49"></div>
           </div>
           <div style="font-size: 500px;">
-            <div id="set51" style="font-size: scriptlevel(51)"></div>
+            <div id="set51" style="font-size: math; math-depth: 51"></div>
           </div>
           <div style="font-size: 200px;">
-            <div id="set48" style="font-size: scriptlevel(48)"></div>
+            <div id="set48" style="font-size: math; math-depth: 48"></div>
           </div>
           <div style="font-size: 1000px;">
-            <div id="set52" style="font-size: scriptlevel(52)"></div>
+            <div id="set52" style="font-size: math; math-depth: 52"></div>
           </div>
           <div style="font-size: 30px;">
-            <div id="set41" style="font-size: scriptlevel(41)"></div>
+            <div id="set41" style="font-size: math; math-depth: 41"></div>
           </div>
           <div style="font-size: 2000px;">
-            <div id="set59" style="font-size: scriptlevel(59)"></div>
+            <div id="set59" style="font-size: math; math-depth: 59"></div>
           </div>
         </div>
       </div>
 
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>math-depth</title>
+    <meta charset="utf-8">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      .container {
+          /* Ahem font does not have a MATH table so the font-size scale factor
+             is always 0.71^{computed - inherited math script level} */
+          font: 100px/1 Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <p>Test passes if you see two squares of side 100px.</p>
+    <div class="container">
+      <div>X</div>
+    </div>
+    <br/>
+    <div class="container">
+      <div>X</div>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>math-depth</title>
+    <meta charset="utf-8">
+    <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/3746">
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-math-script-level-property">
+    <meta name="assert" content="If specified font-size is not 'math' then math-depth does not affect the computed value of font-size.">
+    <link rel="match" href="math-script-level-003.tentative-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      .container {
+          /* Ahem font does not have a MATH table so the font-size scale factor
+             is always 0.71^{computed - inherited math script level} */
+          font: 100px/1 Ahem;
+      }
+    </style>
+  </head>
+  <body>
+    <p>Test passes if you see two squares of side 100px.</p>
+    <div class="container" style="math-script-level: 3;">
+      <div style="math-level: 9; font-size: 100px;">X</div>
+    </div>
+    <br/>
+    <div class="container" style="math-script-level: 3;">
+      <div style="math-level: 9;">X</div>
+    </div>
+  </body>
+</html>
@@ -37,13 +37,13 @@
       }
       .big { font-size: 3000px; }
       .small { font-size: 150px; }
-      .level-3 { font-size: scriptlevel(-3); }
-      .level-1 { font-size: scriptlevel(-1); }
-      .level0 { font-size: scriptlevel(0); }
-      .level1 { font-size: scriptlevel(1); }
-      .level2 { font-size: scriptlevel(2); }
-      .level3 { font-size: scriptlevel(3); }
-      .level5 { font-size: scriptlevel(5); }
+      .level-3 { font-size: math; math-depth: -3; }
+      .level-1 { font-size: math; math-depth: -1; }
+      .level0 { font-size: math; math-depth: 0; }
+      .level1 { font-size: math; math-depth: 1; }
+      .level2 { font-size: math; math-depth: 2; }
+      .level3 { font-size: math; math-depth: 3; }
+      .level5 { font-size: math; math-depth: 5; }
     </style>
     <script>
       const big = 3000;