mozilla-central: changeset 87148:f0ac2d720c7b1e75b61a51ba31751b063c9a6e41

author	Mats Palmgren <matspal@gmail.com>
	Sat, 18 Feb 2012 02:34:21 +0100
changeset 87148	f0ac2d720c7b1e75b61a51ba31751b063c9a6e41
parent 87147	aaed6b9c89528ad6360ca2acbed3adcc74a83a96
child 87149	ece583b83508f0dda79f1e2ff63393150d9b0731
push id	22083
push user	bmo@edmorley.co.uk
push date	Sat, 18 Feb 2012 11:19:19 +0000
treeherder	mozilla-central@20478b673212 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	roc
bugs	725376
milestone	13.0a1
first release with	nightly linux32 4d47329bb02e / 13.0a1 / 20120219031223 / files nightly linux64 4d47329bb02e / 13.0a1 / 20120219031223 / files nightly mac 4d47329bb02e / 13.0a1 / 20120219031223 / files nightly win32 4d47329bb02e / 13.0a1 / 20120219031223 / files nightly win64 4d47329bb02e / 13.0a1 / 20120219031223 / files
last release without	nightly linux32 2271cb92cc05 / 13.0a1 / 20120217031227 / files nightly linux64 2271cb92cc05 / 13.0a1 / 20120217031227 / files nightly mac 2271cb92cc05 / 13.0a1 / 20120217031227 / files nightly win32 2271cb92cc05 / 13.0a1 / 20120217031227 / files nightly win64 2271cb92cc05 / 13.0a1 / 20120217031227 / files

--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -361,17 +361,17 @@ nsColumnSetFrame::ChooseColumnStrategy(c
     colHeight = aReflowState.ComputedHeight();
   }
 
   nscoord colGap = GetColumnGap(this, colStyle);
   PRInt32 numColumns = colStyle->mColumnCount;
 
   bool isBalancing = colStyle->mColumnFill == NS_STYLE_COLUMN_FILL_BALANCE;
   if (isBalancing) {
-    const PRUint32 MAX_NESTED_COLUMN_BALANCING = 5;
+    const PRUint32 MAX_NESTED_COLUMN_BALANCING = 2;
     PRUint32 cnt = 1;
     for (const nsHTMLReflowState* rs = aReflowState.parentReflowState;
          rs && cnt < MAX_NESTED_COLUMN_BALANCING;
          rs = rs->parentReflowState) {
       if (rs->mFlags.mIsColumnBalancing) {
         ++cnt;
       }
     }