Backed out 2 changesets (bug 1584890) for crashtest failures on 1608851.html. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Fri, 22 May 2020 00:49:26 +0300
changeset 531519 8405ac2a305a16d869b0c0da87dc426df2633739
parent 531518 6470dd78730775c6223da8ac9f4cb9edad68beb2
child 531520 00acf6329f85b69453113a1edbf0d904806c6e0d
push id37440
push userabutkovits@mozilla.com
push dateFri, 22 May 2020 09:43:16 +0000
treeherdermozilla-central@fbf71e4d2e21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1584890, 1608851
milestone78.0a1
backs out3265c120177ff5e7cfe35fd9ab165c7d74284106
057922187f3daa2396c04828dee2baeb895865bc
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1584890) for crashtest failures on 1608851.html. CLOSED TREE Backed out changeset 3265c120177f (bug 1584890) Backed out changeset 057922187f3d (bug 1584890)
layout/base/nsCSSFrameConstructor.cpp
layout/generic/crashtests/crashtests.list
testing/web-platform/tests/css/css-position/position-absolute-root-element-flex.html
testing/web-platform/tests/css/css-position/position-absolute-root-element-grid.html
testing/web-platform/tests/css/css-position/position-absolute-root-element-ref.html
testing/web-platform/tests/css/css-position/position-fixed-root-element-flex.html
testing/web-platform/tests/css/css-position/position-fixed-root-element-grid.html
testing/web-platform/tests/css/css-position/position-fixed-root-element-ref.html
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -2299,22 +2299,19 @@ nsIFrame* nsCSSFrameConstructor::Constru
              display->mDisplay == StyleDisplay::WebkitBox ||
              display->mDisplay == StyleDisplay::Grid ||
              (StaticPrefs::layout_css_emulate_moz_box_with_flex() &&
               display->mDisplay == StyleDisplay::MozBox)) {
     auto func = display->mDisplay == StyleDisplay::Grid
                     ? NS_NewGridContainerFrame
                     : NS_NewFlexContainerFrame;
     contentFrame = func(mPresShell, computedStyle);
-    InitAndRestoreFrame(
-        state, aDocElement,
-        state.GetGeometricParent(*display, mDocElementContainingBlock),
-        contentFrame);
-    state.AddChild(contentFrame, frameList, aDocElement,
-                   mDocElementContainingBlock);
+    InitAndRestoreFrame(state, aDocElement, mDocElementContainingBlock,
+                        contentFrame);
+    frameList = {contentFrame, contentFrame};
     processChildren = true;
 
     contentFrame->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
     if (display->IsAbsPosContainingBlock(contentFrame)) {
       state.PushAbsoluteContainingBlock(contentFrame, contentFrame,
                                         absoluteSaveState);
     }
   } else if (display->mDisplay == StyleDisplay::Table) {
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -747,17 +747,17 @@ load 1572901.html
 load 1573216.html
 load 1574552.html
 load 1574993.html
 load 1582019.html
 load 1586470.html
 load 1588955-very-large-frameset.html
 load 1590569.html
 load 1596310.html
-skip-if(Android) load 1608851.html # bug 1639947
+load 1608851.html
 load 1613210.html
 load 1614101.html
 load 1618312.html
 load 1618564.html
 load 1625051-1.html
 load 1625051-2.html
 load 1626970.html
 load 1628804.html
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-absolute-root-element-flex.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position: Box inset properties & position:absolute flex container as the root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-position-3/#insets">
-  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1584890">
-  <link rel="match" href="position-absolute-root-element-ref.html">
-  <meta name="assert" content="This test verifies the box inset properties on a position:absolute flex container root element.">
-
-  <style>
-  html {
-    display: flex;
-    position: absolute;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-absolute-root-element-grid.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position: Box inset properties & position:absolute grid container as the root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-position-3/#insets">
-  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1584890">
-  <link rel="match" href="position-absolute-root-element-ref.html">
-  <meta name="assert" content="This test verifies the box inset properties on a position:absolute grid container root element.">
-
-  <style>
-  html {
-    display: grid;
-    position: absolute;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-absolute-root-element-ref.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position Reference: Box inset properties & position:absolute root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-
-  <style>
-  html {
-    display: block;
-    position: absolute;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-fixed-root-element-flex.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position: Box inset properties & position:fixed flex container as the root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-position-3/#insets">
-  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1584890">
-  <link rel="match" href="position-fixed-root-element-ref.html">
-  <meta name="assert" content="This test verifies the box inset properties on a position:fixed flex container root element.">
-
-  <style>
-  html {
-    display: flex;
-    position: fixed;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-fixed-root-element-grid.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position: Box inset properties & position:fixed grid container as the root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-  <link rel="help" href="https://drafts.csswg.org/css-position-3/#insets">
-  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1584890">
-  <link rel="match" href="position-fixed-root-element-ref.html">
-  <meta name="assert" content="This test verifies the box inset properties on a position:fixed grid container root element.">
-
-  <style>
-  html {
-    display: grid;
-    position: fixed;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>
deleted file mode 100644
--- a/testing/web-platform/tests/css/css-position/position-fixed-root-element-ref.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <meta charset="UTF-8">
-  <title>CSS Position Reference: Box inset properties & position:fixed root element</title>
-  <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
-  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
-  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
-
-  <style>
-  html {
-    display: block;
-    position: fixed;
-    left: 10px;
-    right: 20px;
-    top: 30px;
-    bottom: 40px;
-    border: 5px dashed black;
-    box-sizing: border-box;
-  }
-  </style>
-
-  The black border should encompass the whole viewport,
-  with a bit of space on each side.
-  <br><br>
-  It shouldn't just shrinkwrap this text's height.
-</html>