Landing Job 2633

Failed to land

Landing requested on , by fwang@igalia.com.

Stack: D230738

Revisions: D230738 diff 1015884

While applying revision D230738 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • layout/mathml/nsMathMLmfracFrame.cpp @ 1e3f73064ae84ad7897b40adce555096fb3ed255 
    • --- nsMathMLmfracFrame.cpp
+++ nsMathMLmfracFrame.cpp
...

    --- nsMathMLmfracFrame.cpp
+++ nsMathMLmfracFrame.cpp
@@ -197,13 +195,12 @@
   }
 
   // see if the linethickness attribute is there
   nsAutoString value;
   mContent->AsElement()->GetAttr(nsGkAtoms::linethickness_, value);
-  mLineThickness =
-      CalcLineThickness(presContext, mComputedStyle, value, onePixel,
-                        defaultRuleThickness, fontSizeInflation);
+  mLineThickness = CalcLineThickness(value, onePixel, defaultRuleThickness,
+                                     fontSizeInflation);
 
   bool displayStyle = StyleFont()->mMathStyle == StyleMathStyle::Normal;
 
   mLineRect.height = mLineThickness;

Last update: 

Raw error output:
Problem while applying patch in revision 230738:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpboz2zq7hdiff: applying /tmp/tmpboz2zq7hdiff

patching file layout/mathml/nsMathMLmtableFrame.cpp
Hunk #2 succeeded at 446 with fuzz 1 (offset 0 lines).
patching file layout/mathml/nsMathMLmfracFrame.cpp
Hunk #3 FAILED at 194
1 out of 3 hunks FAILED -- saving rejects to file layout/mathml/nsMathMLmfracFrame.cpp.rej
abort: patch failed to apply