Backed out changeset 14868b3c13e3 (bug 1373767) for android reftest failures in font-inflation-1.html a=backout CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Tue, 18 Jul 2017 22:40:00 -0700
changeset 418253 1aa1c1bd2a658856e1a906e789f9d771730e1070
parent 418252 a4e7af47aa3a1de0d2c79dec6512963ee37c177a
child 418254 51aaede1a000fbf0e2914f3e2f572089a758e36a
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1373767
milestone56.0a1
backs out14868b3c13e3881ba83019c56292792281f87302
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 changeset 14868b3c13e3 (bug 1373767) for android reftest failures in font-inflation-1.html a=backout CLOSED TREE MozReview-Commit-ID: 5cpCdxuXNin
layout/base/nsCSSFrameConstructor.cpp
layout/mathml/crashtests/1373767-1.html
layout/mathml/crashtests/crashtests.list
layout/mathml/nsMathMLContainerFrame.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -5248,16 +5248,17 @@ nsCSSFrameConstructor::FlushAccumulatedB
   blockContext = styleSet->
     ResolveInheritingAnonymousBoxStyle(anonPseudo, parentContext);
 
   // then, create a block frame that will wrap the child frames. Make it a
   // MathML frame so that Get(Absolute/Float)ContainingBlockFor know that this
   // is not a suitable block.
   nsContainerFrame* blockFrame =
     NS_NewMathMLmathBlockFrame(mPresShell, blockContext);
+  blockFrame->AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS);
 
   InitAndRestoreFrame(aState, aContent, aParentFrame, blockFrame);
   ReparentFrames(this, blockFrame, aBlockItems);
   // abs-pos and floats are disabled in MathML children so we don't have to
   // worry about messing up those.
   blockFrame->SetInitialChildList(kPrincipalList, aBlockItems);
   NS_ASSERTION(aBlockItems.IsEmpty(), "What happened?");
   aBlockItems.Clear();
deleted file mode 100644
--- a/layout/mathml/crashtests/1373767-1.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<style>
-math {
-  position: fixed;
-}
-div {
-  transform: translateZ(0px);
-}
-body {
-  display: -moz-grid;
-}
-</style>
-</head>
-<body>
-<div>
-<math></math>
-</div>
-</body>
-</html>
--- a/layout/mathml/crashtests/crashtests.list
+++ b/layout/mathml/crashtests/crashtests.list
@@ -60,10 +60,9 @@ load 713606-1.html
 load 716349-1.html
 load 767251.xhtml
 load 848725-1.html
 load 848725-2.html
 load 947557-1.html
 load 973322-1.xhtml
 load 1028521-1.xhtml
 load 1061027.html
-load 1373767-1.html
 load 1376158.html
--- a/layout/mathml/nsMathMLContainerFrame.cpp
+++ b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -1545,19 +1545,17 @@ nsMathMLContainerFrame::ReportInvalidChi
   return ReportErrorToConsole("InvalidChild", argv, 2);
 }
 
 //==========================
 
 nsContainerFrame*
 NS_NewMathMLmathBlockFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
 {
-  auto newFrame = new (aPresShell) nsMathMLmathBlockFrame(aContext);
-  newFrame->AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS);
-  return newFrame;
+  return new (aPresShell) nsMathMLmathBlockFrame(aContext);
 }
 
 NS_IMPL_FRAMEARENA_HELPERS(nsMathMLmathBlockFrame)
 
 NS_QUERYFRAME_HEAD(nsMathMLmathBlockFrame)
   NS_QUERYFRAME_ENTRY(nsMathMLmathBlockFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame)