diff --git a/layout/style/ServoCSSPropList.mako.py b/layout/style/ServoCSSPropList.mako.py
index cb9e73892bb9..4224b1bb8422 100644
--- a/layout/style/ServoCSSPropList.mako.py
+++ b/layout/style/ServoCSSPropList.mako.py
@@ -95,6 +95,9 @@ SERIALIZED_PREDEFINED_TYPES = [
     "FontWeight",
     "Integer",
     "Length",
+    "LengthOrPercentage",
+    "NonNegativeLength",
+    "NonNegativeLengthOrPercentage",
     "ListStyleType",
     "Opacity",
     "url::ImageUrlOrNone",
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 43415dda031e..cc9a12d041f7 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -3396,14 +3396,6 @@ nsComputedDOMStyle::DoGetTextEmphasisStyle()
   return valueList.forget();
 }
 
-already_AddRefed<CSSValue>
-nsComputedDOMStyle::DoGetTextIndent()
-{
-  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
-  SetValueToCoord(val, StyleText()->mTextIndent, false);
-  return val.forget();
-}
-
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetTextOverflow()
 {
@@ -5088,14 +5080,6 @@ nsComputedDOMStyle::DoGetClipPath()
                         nsCSSProps::kClipPathGeometryBoxKTable);
 }
 
-already_AddRefed<CSSValue>
-nsComputedDOMStyle::DoGetShapeMargin()
-{
-  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
-  SetValueToCoord(val, StyleDisplay()->mShapeMargin, true);
-  return val.forget();
-}
-
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetShapeOutside()
 {
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 1a7863d59e1d..fc7024f75479 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -374,7 +374,6 @@ private:
   already_AddRefed<CSSValue> DoGetTextDecorationStyle();
   already_AddRefed<CSSValue> DoGetTextEmphasisPosition();
   already_AddRefed<CSSValue> DoGetTextEmphasisStyle();
-  already_AddRefed<CSSValue> DoGetTextIndent();
   already_AddRefed<CSSValue> DoGetTextOverflow();
   already_AddRefed<CSSValue> DoGetTextShadow();
   already_AddRefed<CSSValue> DoGetLetterSpacing();
@@ -416,7 +415,6 @@ private:
   already_AddRefed<CSSValue> DoGetScrollSnapCoordinate();
   already_AddRefed<CSSValue> DoGetScrollbarFaceColor();
   already_AddRefed<CSSValue> DoGetScrollbarTrackColor();
-  already_AddRefed<CSSValue> DoGetShapeMargin();
   already_AddRefed<CSSValue> DoGetShapeOutside();
 
   /* User interface properties */
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini
index 19ac0f51281e..b075105ea51c 100644
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-003.html.ini
@@ -2,12 +2,3 @@
   [calc((12.5%*6 + 10in) / 4) - inline style]
     expected: FAIL
 
-  [calc(30%) - computed style]
-    expected: FAIL
-
-  [calc(100%/4) - computed style]
-    expected: FAIL
-
-  [calc(25%*3) - computed style]
-    expected: FAIL
-