Bug 733614: Backout changes from bug 695222 for mozilla 16 branch [r=dbaron].

2012-06-13 11:00:56 -05:00 · 2012-06-13 11:00:56 -05:00 · 792e0700cf
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@ -14,7 +14,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Style
 */

-[builtinclass, scriptable, uuid(08fd9493-9276-4861-9b16-add2653e2f53)]
+[builtinclass, scriptable, uuid(35b2c7f0-b56c-11e1-afa6-0800200c9a66)]
 interface nsIDOMCSS2Properties : nsISupports
 {
           attribute DOMString        background;
@ -498,9 +498,6 @@ interface nsIDOMCSS2Properties : nsISupports
           attribute DOMString        MozColumnWidth;
                                        // raises(DOMException) on setting

-           attribute DOMString        MozColumnFill;
-                                        // raises(DOMException) on setting
-
           attribute DOMString        MozColumnGap;
                                        // raises(DOMException) on setting

--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@ -764,9 +764,6 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
 #define NS_STYLE_COLUMN_COUNT_AUTO              0
 #define NS_STYLE_COLUMN_COUNT_UNLIMITED         (-1)

-#define NS_STYLE_COLUMN_FILL_AUTO               0
-#define NS_STYLE_COLUMN_FILL_BALANCE            1
-
 // See nsStyleUIReset
 #define NS_STYLE_IME_MODE_AUTO                  0
 #define NS_STYLE_IME_MODE_NORMAL                1
--- a/layout/generic/crashtests/399412-1.html
+++ b/layout/generic/crashtests/399412-1.html
@ -17,7 +17,6 @@ body {
  width: 300px;
  -moz-column-width: 50px;
  -moz-column-gap: 1px;
-  -moz-column-fill: auto;
 }
 </style>

--- a/layout/generic/crashtests/673770.html
+++ b/layout/generic/crashtests/673770.html
@ -13,7 +13,7 @@
      }
    </script>
  </head>
-  <body style="-moz-column-width: 1px; -moz-column-fill: auto;" onload="boom();">
+  <body style="-moz-column-width: 1px;" onload="boom();">
    <hr size="100" color="blue"><div style="position: absolute;"></div><div id="x" style="height: 5px;"></div>
  </body>
 </html>
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@ -375,7 +375,7 @@ load text-overflow-bug666751-2.html
 asserts(0-1) load text-overflow-bug670564.xhtml
 load text-overflow-bug671796.xhtml
 load 667025.html
-asserts-if(Android,8) load 673770.html
+asserts(14) asserts-if(Android,8) load 673770.html # bug 569193 and bug 459597
 load 679933-1.html
 load 682649-1.html
 load 683702-1.xhtml
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@ -331,21 +331,17 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
  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 = 2;
-    PRUint32 cnt = 1;
-    for (const nsHTMLReflowState* rs = aReflowState.parentReflowState;
-         rs && cnt < MAX_NESTED_COLUMN_BALANCING;
-         rs = rs->parentReflowState) {
-      if (rs->mFlags.mIsColumnBalancing) {
-        ++cnt;
-      }
-    }
-    if (cnt == MAX_NESTED_COLUMN_BALANCING) {
-      numColumns = 1;
+  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;
    }
  }
+  if (cnt == MAX_NESTED_COLUMN_BALANCING) {
+    numColumns = 1;
+  }

  nscoord colWidth;
  if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
@ -399,22 +395,18 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
    expectedWidthLeftOver = extraSpace - (extraToColumns*numColumns);
  }

-  // If column-fill is set to 'balance', then we want to balance the columns.
-  if (isBalancing) {
+  // NOTE that the non-balancing behavior for non-auto computed height
+  // is not in the CSS3 columns draft as of 18 January 2001
+  if (aReflowState.ComputedHeight() == NS_INTRINSICSIZE) {
    // Balancing!
-
    if (numColumns <= 0) {
      // Hmm, auto column count, column width or available width is unknown,
      // and balancing is required. Let's just use one column then.
      numColumns = 1;
    }
-
-    colHeight = NS_MIN(mLastBalanceHeight,
-                       GetAvailableContentHeight(aReflowState));
+    colHeight = NS_MIN(mLastBalanceHeight, GetAvailableContentHeight(aReflowState));
  } else {
-    // This is the case when the column-fill property is set to 'auto'.
    // No balancing, so don't limit the column count
-
    numColumns = PR_INT32_MAX;
  }

@ -641,8 +633,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics&     aDesiredSize,
      kidReflowState.mFlags.mIsTopOfPage = true;
      kidReflowState.mFlags.mTableIsSplittable = false;
      kidReflowState.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < PR_INT32_MAX;
-          
-#ifdef DEBUG_roc
+
+      #ifdef DEBUG_roc
      printf("*** Reflowing child #%d %p: availHeight=%d\n",
             columnCount, (void*)child,availSize.height);
 #endif
--- a/layout/reftests/bugs/368020-1-ref.html
+++ b/layout/reftests/bugs/368020-1-ref.html
@ -5,7 +5,7 @@
 </head>
 <body>

-<div style="-moz-column-count: 2; column-count: 2; -moz-column-fill: auto; height: 3.5em; background:yellow">
+<div style="-moz-column-count: 2; column-count: 2; height: 3.5em; background:yellow">

  <div style="margin: 7px 1% 2px 2em; border: medium dotted; border-width: 2px 3px 4px 5px;">
    <div style="background: url(repeatable-diagonal-gradient.png);">
--- a/layout/reftests/bugs/368020-1.html
+++ b/layout/reftests/bugs/368020-1.html
@ -5,7 +5,7 @@
 </head>
 <body>

-<div style="-moz-column-count: 2; column-count: 2;  -moz-column-fill: auto; height: 3.5em; background:yellow">
+<div style="-moz-column-count: 2; column-count: 2; height: 3.5em; background:yellow">

  <div>
    <div style="background: url(repeatable-diagonal-gradient.png); background-clip: padding-box; background-clip: padding; background-origin: padding-box; background-origin: padding; margin: 7px 1% 2px 2em; border: medium dotted; border-width: 2px 3px 4px 5px; padding: 8px 6px 4px 2px;">
--- a/layout/reftests/bugs/379349-2-ref.xhtml
+++ b/layout/reftests/bugs/379349-2-ref.xhtml
@ -41,7 +41,6 @@
      width: 300pt;
      -moz-column-width: 100pt;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid gray;
      position: relative;
    }
--- a/layout/reftests/bugs/379349-2a.xhtml
+++ b/layout/reftests/bugs/379349-2a.xhtml
@ -48,7 +48,6 @@
      width: 300pt;
      -moz-column-width: 100pt;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid gray;
    }
  </style>
--- a/layout/reftests/bugs/379349-2b.xhtml
+++ b/layout/reftests/bugs/379349-2b.xhtml
@ -48,7 +48,6 @@
      width: 300pt;
      -moz-column-width: 100pt;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid gray;
    }
  </style>
--- a/layout/reftests/bugs/563584-9c.html
+++ b/layout/reftests/bugs/563584-9c.html
@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; -moz-column-fill: auto; margin: 0; -moz-column-gap: 0; height: 200px;">
+<body style="-moz-column-width: 200px; margin: 0; -moz-column-gap: 0; height: 200px;">
 <div style="float: left;">
  <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
 </div>
--- a/layout/reftests/bugs/563584-9d.html
+++ b/layout/reftests/bugs/563584-9d.html
@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <title>Test for pushing of floats to next column when float breaking in columns is disabled</title>
-<body style="-moz-column-width: 200px; margin: 0; -moz-column-fill: auto; -moz-column-gap: 0; height: 200px;">
+<body style="-moz-column-width: 200px; margin: 0; -moz-column-gap: 0; height: 200px;">
 <div style="float: left;">
  <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
 </div>
--- a/layout/reftests/columns/ahem.css
+++ b/layout/reftests/columns/ahem.css
@ -1,4 +0,0 @@
-@font-face {
-  font-family: "Ahem";
-  src: url(../fonts/Ahem.ttf);
-}
--- a/layout/reftests/columns/columnfill-auto-ref.html
+++ b/layout/reftests/columns/columnfill-auto-ref.html
@ -1,32 +0,0 @@
-<html>
-<head>
-  <link rel="stylesheet" type="text/css" href="ahem.css" />
-
-  <style>
-    td.text {
-      width: 200px;
-      text-align: left;
-      font-family: ahem;
-      font-size: 12pt;
-      line-height: 1.1;
-    }
-
-    table {
-      width: 100%;
-      font-family: ahem;
-      font-size: 12pt;
-      line-height: 1.1;
-    }
-  </style>
-</head>
-
-<body>
-  <table cellpadding=0 cellspacing=0>
-    <tr>
-      <td class="text" valign="top">
-        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam.</td>
-      <td class="text" valign="top">Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci</td>
-      <td valign="top" class="text">vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.</td>
-    </tr>
-  </table>
-</body>
--- a/layout/reftests/columns/columnfill-auto.html
+++ b/layout/reftests/columns/columnfill-auto.html
@ -1,19 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="ahem.css" />
-  </head>
-
-  <body>
-    <div style="width: 100%;">
-    <div style="-moz-column-width: 200px;
-                -moz-column-gap: 0px;
-                -moz-column-fill: auto;
-                height: 120px;
-                font-family: ahem;
-                font-size: 12pt;
-		line-height: 1.1;">
-      Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
-    </div>
-    </div>
-  </body>
-</html>
--- a/layout/reftests/columns/columnfill-balance-ref.html
+++ b/layout/reftests/columns/columnfill-balance-ref.html
@ -1,33 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="ahem.css" />
-
-    <style>
-      td {
-        width: 200px;
-        font-family: ahem;
-      }
-
-      table {
-        width: 100%;
-        height: 100px;
-        padding-bottom: 0;
-        margin-bottom: 0;
-        font-family: ahem;
-      }
-    </style>
-  </head>
-  <body>
-    <table cellpadding=0 cellspacing=0>
-      <tr>
-        <td valign="top">
-          Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam.
-        </td>
-        <td valign="top">Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci
-        </td>
-        <td valign="top">vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
--- a/layout/reftests/columns/columnfill-balance.html
+++ b/layout/reftests/columns/columnfill-balance.html
@ -1,16 +0,0 @@
-<html>
-  <head>
-      <link rel="stylesheet" type="text/css" href="ahem.css" />
-  </head>
-  <body>
-    <div style="-moz-column-width: 200px;
-                -moz-column-gap: 0px;
-                -moz-column-fill: balance;
-                height: 100px;
-                margin-bottom: 0;
-                padding-bottom: 0;
-                font-family: ahem;">
-      Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
-    </div>
-  </body>
-</html>
--- a/layout/reftests/columns/columnfill-change-ref.html
+++ b/layout/reftests/columns/columnfill-change-ref.html
@ -1,26 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Bug 695222: Test for change of column-fill property REFERENCE</title>
-    <link rel="stylesheet" type="text/css" href="ahem.css" />
-    <style>
-      .columns {
-        -moz-column-count: 3;
-        -moz-column-gap: 0px;
-        -moz-column-fill: balance;
-        height: 120px;
-        font-family: ahem;
-        font-size: 12pt;
-        line-height: 1.1;
-      }
-    </style>
-  </head>
-  <body>
-    <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=695222">Mozilla Bug 695222</a>
-    <div id="test" style="display: block;">
-      <div id="columnsElement" class="columns">
-              Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
-      </div>
-    </div>
-  </body>
-</html>
--- a/layout/reftests/columns/columnfill-change.html
+++ b/layout/reftests/columns/columnfill-change.html
@ -1,35 +0,0 @@
-<!doctype html>
-<html class="reftest-wait">
-  <head>
-    <link rel="stylesheet" type="text/css" href="ahem.css" />
-    <title>Bug 695222: Test for change of column-fill property</title>
-    <style>
-      .columns {
-        -moz-column-count: 3;
-        -moz-column-gap: 0px;
-        -moz-column-fill: auto;
-        height: 120px;
-        font-family: ahem;
-        font-size: 12pt;
-        line-height: 1.1;
-      }
-    </style>
-    <script type="text/javascript">
-      function disableWait() {
-        document.documentElement.removeAttribute('class');
-      }
-      function main() {
-        document.getElementById('columnsElement').style.MozColumnFill = 'balance';
-        setTimeout(disableWait, 500);
-      }
-    </script>
-  </head>
-  <body onload="main();">
-    <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=695222">Mozilla Bug 695222</a>
-    <div id="test" style="display: block;">
-      <div id="columnsElement" class="columns">
-              Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam. Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orci vitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
-      </div>
-    </div>
-  </body>
-</html>
--- a/layout/reftests/columns/columnfill-overflow-style-ref.html
+++ b/layout/reftests/columns/columnfill-overflow-style-ref.html
@ -1,21 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-	<title>Bug 715203: Multicolumn support in scrolled columns</title>
-	<style>
-		.columns {
-        		font-size: 12pt;
-        		line-height: 1.1;
-			-moz-column-width: 40em;
-                        -moz-column-fill: auto;
-		}
-	</style>
-</head>
-<body>
-	<div class="columns">
-		<li>one
-		<li>two
-		<li>three
-	</div>
-</body>
-</html>
--- a/layout/reftests/columns/columnfill-overflow-style.html
+++ b/layout/reftests/columns/columnfill-overflow-style.html
@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-	<title>Bug 715203: Multicolumn support in scrolled columns</title>
-	<style>
-		.columns {
-        		font-size: 12pt;
-        		line-height: 1.1;
-			-moz-column-width: 40em;
-                        -overflow-x:auto;
-                        -moz-column-fill: auto;
-		}
-	</style>
-</head>
-<body>
-	<div class="columns">
-		<li>one
-		<li>two
-		<li>three
-	</div>
-</body>
-</html>
--- a/layout/reftests/columns/reftest.list
+++ b/layout/reftests/columns/reftest.list
@ -16,15 +16,7 @@
 == column-balancing-002.html column-balancing-002.ref.html
 == column-balancing-003.html column-balancing-000.ref.html
 == column-balancing-004.html column-balancing-004.ref.html
-
-# These next tests need to be a http tests because they use the ahem font,
-# located in layout/reftests/fonts.
-HTTP(..) == columnfill-balance.html columnfill-balance-ref.html
-HTTP(..) == columnfill-auto.html columnfill-auto-ref.html
-HTTP(..) == columnfill-change.html columnfill-change-ref.html
-
 == columnrule-basic.html columnrule-basic-ref.html
 == columnrule-complex.html columnrule-complex-ref.html
 != columnrule-linestyles.html columnrule-linestyles-notref.html
 == columnrule-padding.html columnrule-padding-ref.html
-== columnfill-overflow-style.html columnfill-overflow-style-ref.html
--- a/layout/reftests/pagination/abspos-overflow-01-cols.xhtml
+++ b/layout/reftests/pagination/abspos-overflow-01-cols.xhtml
@ -34,7 +34,6 @@
      height: 2in;
      -moz-column-count: 3;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: silver 2pt;
      border-style: none solid;
    }
--- a/layout/reftests/pagination/border-breaking-000-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-000-cols.xhtml
@ -25,7 +25,6 @@
      width: 300px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
      border-style: none solid;
    }
--- a/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
+++ b/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
@ -20,7 +20,6 @@
      width: 300px;
      -moz-column-width: 100px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
      border-style: none solid;
      background: yellow;
--- a/layout/reftests/pagination/border-breaking-001-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-001-cols.xhtml
@ -49,7 +49,6 @@
      width: 300px;
      -moz-column-width: 100px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
      border-style: none solid;
    }
--- a/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
+++ b/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
@ -16,7 +16,6 @@
      width: 300px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
    }
  </style>
--- a/layout/reftests/pagination/border-breaking-002-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-002-cols.xhtml
@ -17,7 +17,6 @@
      width: 300px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
    }
  </style>
--- a/layout/reftests/pagination/border-breaking-003-cols.xhtml
+++ b/layout/reftests/pagination/border-breaking-003-cols.xhtml
@ -20,7 +20,6 @@
      width: 300px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: solid silver;
    }
  </style>
--- a/layout/reftests/pagination/content-inserted-002.ref.xhtml
+++ b/layout/reftests/pagination/content-inserted-002.ref.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-002.xhtml
+++ b/layout/reftests/pagination/content-inserted-002.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-003.xhtml
+++ b/layout/reftests/pagination/content-inserted-003.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-004.xhtml
+++ b/layout/reftests/pagination/content-inserted-004.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-005.xhtml
+++ b/layout/reftests/pagination/content-inserted-005.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-006.xhtml
+++ b/layout/reftests/pagination/content-inserted-006.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-007.xhtml
+++ b/layout/reftests/pagination/content-inserted-007.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/reftests/pagination/content-inserted-009.xhtml
+++ b/layout/reftests/pagination/content-inserted-009.xhtml
@ -13,7 +13,6 @@
      width: 450px;
      -moz-column-width: 150px;
      -moz-column-gap: 0;
-      -moz-column-fill: auto;
      border: 3px solid silver;
    }

--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@ -165,7 +165,6 @@ CSS_KEY(auto, auto)
 CSS_KEY(avoid, avoid)
 CSS_KEY(background, background)
 CSS_KEY(backwards, backwards)
-CSS_KEY(balance, balance)
 CSS_KEY(baseline, baseline)
 CSS_KEY(bidi-override, bidi_override)
 CSS_KEY(blink, blink)
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@ -1377,16 +1377,6 @@ CSS_PROP_COLUMN(
    nsnull,
    offsetof(nsStyleColumn, mColumnCount),
    eStyleAnimType_Custom)
-CSS_PROP_COLUMN(
-    -moz-column-fill,
-    _moz_column_fill,
-    CSS_PROP_DOMPROP_PREFIXED(ColumnFill),
-    CSS_PROPERTY_PARSE_VALUE,
-    "",
-    VARIANT_HK,
-    kColumnFillKTable,
-    CSS_PROP_NO_OFFSET,
-    eStyleAnimType_None)
 CSS_PROP_COLUMN(
    -moz-column-width,
    _moz_column_width,
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@ -1496,12 +1496,6 @@ const PRInt32 nsCSSProps::kColorInterpolationKTable[] = {
  eCSSKeyword_UNKNOWN, -1
 };

-const PRInt32 nsCSSProps::kColumnFillKTable[] = {
-  eCSSKeyword_auto, NS_STYLE_COLUMN_FILL_AUTO,
-  eCSSKeyword_balance, NS_STYLE_COLUMN_FILL_BALANCE,
-  eCSSKeyword_UNKNOWN, -1
-};
-
 bool
 nsCSSProps::FindKeyword(nsCSSKeyword aKeyword, const PRInt32 aTable[], PRInt32& aResult)
 {
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@ -338,7 +338,6 @@ public:
  static const PRInt32 kTextAnchorKTable[];
  static const PRInt32 kTextRenderingKTable[];
  static const PRInt32 kColorInterpolationKTable[];
-  static const PRInt32 kColumnFillKTable[];
  static const PRInt32 kBoxPropSourceKTable[];
  static const PRInt32 kBoxShadowTypeKTable[];
  static const PRInt32 kBoxSizingKTable[];
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@ -719,16 +719,6 @@ nsComputedDOMStyle::DoGetColumnGap()
  return val;
 }

-nsIDOMCSSValue*
-nsComputedDOMStyle::DoGetColumnFill()
-{
-  nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
-  val->SetIdent(
-    nsCSSProps::ValueToKeywordEnum(GetStyleColumn()->mColumnFill,
-                                   nsCSSProps::kColumnFillKTable));
-  return val;
-}
-
 nsIDOMCSSValue*
 nsComputedDOMStyle::DoGetColumnRuleWidth()
 {
@ -4637,7 +4627,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
    COMPUTED_STYLE_MAP_ENTRY(box_pack,                      BoxPack),
    COMPUTED_STYLE_MAP_ENTRY(box_sizing,                    BoxSizing),
    COMPUTED_STYLE_MAP_ENTRY(_moz_column_count,             ColumnCount),
-    COMPUTED_STYLE_MAP_ENTRY(_moz_column_fill,              ColumnFill),
    COMPUTED_STYLE_MAP_ENTRY(_moz_column_gap,               ColumnGap),
    //// COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule,         ColumnRule),
    COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule_color,        ColumnRuleColor),
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@ -335,7 +335,6 @@ private:

  /* Column properties */
  nsIDOMCSSValue* DoGetColumnCount();
-  nsIDOMCSSValue* DoGetColumnFill();
  nsIDOMCSSValue* DoGetColumnWidth();
  nsIDOMCSSValue* DoGetColumnGap();
  nsIDOMCSSValue* DoGetColumnRuleWidth();
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -6976,13 +6976,6 @@ nsRuleNode::ComputeColumnData(void* aStartStruct,
    column->mColumnRuleColorIsForeground = false;
  }

-  // column-fill: enum
-  SetDiscrete(*aRuleData->ValueForColumnFill(),
-              column->mColumnFill, canStoreInRuleTree,
-              SETDSC_ENUMERATED, parent->mColumnFill,
-              NS_STYLE_COLUMN_FILL_BALANCE,
-              0, 0, 0, 0);
-
  COMPUTE_END_RESET(Column, column)
 }

--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@ -774,7 +774,6 @@ nsStyleColumn::nsStyleColumn(nsPresContext* aPresContext)
  mColumnCount = NS_STYLE_COLUMN_COUNT_AUTO;
  mColumnWidth.SetAutoValue();
  mColumnGap.SetNormalValue();
-  mColumnFill = NS_STYLE_COLUMN_FILL_BALANCE;

  mColumnRuleWidth = (aPresContext->GetBorderWidthTable())[NS_STYLE_BORDER_WIDTH_MEDIUM];
  mColumnRuleStyle = NS_STYLE_BORDER_STYLE_NONE;
@ -806,8 +805,7 @@ nsChangeHint nsStyleColumn::CalcDifference(const nsStyleColumn& aOther) const
    return NS_STYLE_HINT_FRAMECHANGE;

  if (mColumnWidth != aOther.mColumnWidth ||
-      mColumnGap != aOther.mColumnGap ||
-      mColumnFill != aOther.mColumnFill)
+      mColumnGap != aOther.mColumnGap)
    return NS_STYLE_HINT_REFLOW;

  if (GetComputedColumnRuleWidth() != aOther.GetComputedColumnRuleWidth() ||
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@ -2077,8 +2077,6 @@ struct nsStyleColumn {

  nscolor      mColumnRuleColor;  // [reset]
  PRUint8      mColumnRuleStyle;  // [reset]
-  PRUint8      mColumnFill;  // [reset] see nsStyleConsts.h
-
  // See https://bugzilla.mozilla.org/show_bug.cgi?id=271586#c43 for why
  // this is hard to replace with 'currentColor'.
  bool mColumnRuleColorIsForeground;
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@ -517,14 +517,6 @@ var gCSSProperties = {
 		// negative and zero invalid per editor's draft
 		invalid_values: [ "-1", "0", "3px" ]
 	},
-	"-moz-column-fill": {
-		domProp: "MozColumnFill",
-		inherited: false,
-		type: CSS_TYPE_LONGHAND,
-		initial_values: [ "balance" ],
-		other_values: [ "auto" ],
-		invalid_values: [ "2px", "dotted", "5em" ]
-	},
 	"-moz-column-gap": {
 		domProp: "MozColumnGap",
 		inherited: false,
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@ -135,7 +135,6 @@
  -moz-column-width: inherit;
  -moz-column-gap: inherit;
  -moz-column-rule: inherit;
-  -moz-column-fill: inherit;
  /* Do not change these. nsCSSFrameConstructor depends on them to create a good
     frame tree. */
  position: static !important;