Bug 1316649 - A parent dummy ReflowInput is also the CB ReflowInput. r=dholbert
authorMats Palmgren <mats@mozilla.com>
Fri, 11 Nov 2016 18:28:43 +0100
changeset 367371 66639f197fa262ce961a7d018d8f473b63413e5b
parent 367370 410135b3dd561a6d6e7f8664504cc7afee67d142
child 367372 9d1b72a21a395e36cbfd9982243054e64a955bb3
push id1369
push userjlorenzo@mozilla.com
push dateMon, 27 Feb 2017 14:59:41 +0000
treeherdermozilla-release@d75a1dba431f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1316649
milestone52.0a1
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
Bug 1316649 - A parent dummy ReflowInput is also the CB ReflowInput. r=dholbert
layout/generic/ReflowInput.cpp
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -480,16 +480,20 @@ ReflowInput::Init(nsPresContext*     aPr
 }
 
 void ReflowInput::InitCBReflowInput()
 {
   if (!mParentReflowInput) {
     mCBReflowInput = nullptr;
     return;
   }
+  if (mParentReflowInput->mFlags.mDummyParentReflowInput) {
+    mCBReflowInput = mParentReflowInput;
+    return;
+  }
 
   if (mParentReflowInput->mFrame == mFrame->GetContainingBlock()) {
     // Inner table frames need to use the containing block of the outer
     // table frame.
     if (mFrame->GetType() == nsGkAtoms::tableFrame) {
       mCBReflowInput = mParentReflowInput->mCBReflowInput;
     } else {
       mCBReflowInput = mParentReflowInput;