Backed out changeset e9ea26dd5b68 (bug 1539318) for crashtest failures on 1539318-1.html.

2019-05-02 03:18:12 +03:00 · 2019-05-02 03:18:12 +03:00 · aaedb26cee
--- a/layout/svg/SVGTextFrame.cpp
+++ b/layout/svg/SVGTextFrame.cpp
@ -3666,16 +3666,6 @@ uint32_t SVGTextFrame::GetNumberOfChars(nsIContent* aContent) {
 * text child element.
 */
 float SVGTextFrame::GetComputedTextLength(nsIContent* aContent) {
-  nsIFrame* kid = PrincipalChildList().FirstChild();
-  if (NS_SUBTREE_DIRTY(kid)) {
-    // We're never reflowed if we're under a non-SVG element that is
-    // never reflowed (such as the HTML 'caption' element).
-    //
-    // If we ever decide that we need to return accurate values here,
-    // we could do similar work to GetSubStringLength.
-    return 0;
-  }
-
  UpdateGlyphPositioning();

  float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(
--- a/layout/svg/crashtests/1539318-1.svg
+++ b/layout/svg/crashtests/1539318-1.svg
@ -1,10 +0,0 @@
-<script>
-window.onload = function() {
-  a.getComputedTextLength()
-}
-</script>
-<body>
-<svg>
-<switch>
-<hatch>
-<text id="a">A</text>
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@ -226,4 +226,4 @@ load 1535517-1.svg
 load 1504072.html
 load 1072758.html
 load 1536892.html
-load 1539318-1.html
+