Backed out changeset 9d41238dabf4 (bug 1319318) for unexpected pass crashtest results after merge
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 09 Dec 2016 15:30:56 +0100
changeset 325486 159f68a4533f2f2510a77ed964f8d997f9ba5d06
parent 325485 383de455893c1511918b04c72191893877bd0b5e
child 325487 a0b88dac1929c24e5ce3a4886e30d1692bea29be
child 325531 14af02e8f075e70020f149f81cc40bd6f664253a
child 325595 413644161cfbc4e88f47c2d06ca6511b580eb789
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
bugs1319318
milestone53.0a1
backs out9d41238dabf42896e32ab1df01cb477f25e207f8
Backed out changeset 9d41238dabf4 (bug 1319318) for unexpected pass crashtest results after merge
layout/generic/nsVideoFrame.cpp
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -372,19 +372,17 @@ nsVideoFrame::Reflow(nsPresContext* aPre
                                        aReflowInput,
                                        child,
                                        availableSize);
       ReflowOutput kidDesiredSize(kidReflowInput);
       ReflowChild(child, aPresContext, kidDesiredSize, kidReflowInput,
                   borderPadding.left, borderPadding.top, 0, aStatus);
 
       if (child->GetContent() == mVideoControls && isBSizeShrinkWrapping) {
-        // Resolve our own BSize based on the controls' size in the same axis.
-        contentBoxBSize = myWM.IsOrthogonalTo(wm) ?
-          kidDesiredSize.ISize(wm) : kidDesiredSize.BSize(wm);
+        contentBoxBSize = kidDesiredSize.BSize(myWM);
       }
 
       FinishReflowChild(child, aPresContext,
                         kidDesiredSize, &kidReflowInput,
                         borderPadding.left, borderPadding.top, 0);
     }
 
     if (child->GetContent() == mVideoControls && child->GetSize() != oldChildSize) {