From 792e0700cfdef8b45c36b7f1b6f045e4b69eba46 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Wed, 13 Jun 2012 11:00:56 -0500 Subject: [PATCH] Bug 733614: Backout changes from bug 695222 for mozilla 16 branch [r=dbaron]. --- dom/interfaces/css/nsIDOMCSS2Properties.idl | 5 +-- layout/base/nsStyleConsts.h | 3 -- layout/generic/crashtests/399412-1.html | 1 - layout/generic/crashtests/673770.html | 2 +- layout/generic/crashtests/crashtests.list | 2 +- layout/generic/nsColumnSetFrame.cpp | 38 ++++++++----------- layout/reftests/bugs/368020-1-ref.html | 2 +- layout/reftests/bugs/368020-1.html | 2 +- layout/reftests/bugs/379349-2-ref.xhtml | 1 - layout/reftests/bugs/379349-2a.xhtml | 1 - layout/reftests/bugs/379349-2b.xhtml | 1 - layout/reftests/bugs/563584-9c.html | 2 +- layout/reftests/bugs/563584-9d.html | 2 +- layout/reftests/columns/ahem.css | 4 -- .../reftests/columns/columnfill-auto-ref.html | 32 ---------------- layout/reftests/columns/columnfill-auto.html | 19 ---------- .../columns/columnfill-balance-ref.html | 33 ---------------- .../reftests/columns/columnfill-balance.html | 16 -------- .../columns/columnfill-change-ref.html | 26 ------------- .../reftests/columns/columnfill-change.html | 35 ----------------- .../columnfill-overflow-style-ref.html | 21 ---------- .../columns/columnfill-overflow-style.html | 22 ----------- layout/reftests/columns/reftest.list | 8 ---- .../pagination/abspos-overflow-01-cols.xhtml | 1 - .../pagination/border-breaking-000-cols.xhtml | 1 - .../border-breaking-001-cols.ref.xhtml | 1 - .../pagination/border-breaking-001-cols.xhtml | 1 - .../border-breaking-002-cols.ref.xhtml | 1 - .../pagination/border-breaking-002-cols.xhtml | 1 - .../pagination/border-breaking-003-cols.xhtml | 1 - .../pagination/content-inserted-002.ref.xhtml | 1 - .../pagination/content-inserted-002.xhtml | 1 - .../pagination/content-inserted-003.xhtml | 1 - .../pagination/content-inserted-004.xhtml | 1 - .../pagination/content-inserted-005.xhtml | 1 - .../pagination/content-inserted-006.xhtml | 1 - .../pagination/content-inserted-007.xhtml | 1 - .../pagination/content-inserted-009.xhtml | 1 - layout/style/nsCSSKeywordList.h | 1 - layout/style/nsCSSPropList.h | 10 ----- layout/style/nsCSSProps.cpp | 6 --- layout/style/nsCSSProps.h | 1 - layout/style/nsComputedDOMStyle.cpp | 11 ------ layout/style/nsComputedDOMStyle.h | 1 - layout/style/nsRuleNode.cpp | 7 ---- layout/style/nsStyleStruct.cpp | 4 +- layout/style/nsStyleStruct.h | 2 - layout/style/test/property_database.js | 8 ---- layout/style/ua.css | 1 - 49 files changed, 23 insertions(+), 322 deletions(-) delete mode 100644 layout/reftests/columns/ahem.css delete mode 100644 layout/reftests/columns/columnfill-auto-ref.html delete mode 100644 layout/reftests/columns/columnfill-auto.html delete mode 100644 layout/reftests/columns/columnfill-balance-ref.html delete mode 100644 layout/reftests/columns/columnfill-balance.html delete mode 100644 layout/reftests/columns/columnfill-change-ref.html delete mode 100644 layout/reftests/columns/columnfill-change.html delete mode 100644 layout/reftests/columns/columnfill-overflow-style-ref.html delete mode 100644 layout/reftests/columns/columnfill-overflow-style.html diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl index 3b09afccd7c..59d4ff60d00 100644 --- 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 diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h index 86fd8137bac..9055563018b 100644 --- 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 diff --git a/layout/generic/crashtests/399412-1.html b/layout/generic/crashtests/399412-1.html index bda3b38f500..5ff99d37f56 100644 --- 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; } diff --git a/layout/generic/crashtests/673770.html b/layout/generic/crashtests/673770.html index 9c0fe3b1ef4..ab5018c37ae 100644 --- a/layout/generic/crashtests/673770.html +++ b/layout/generic/crashtests/673770.html @@ -13,7 +13,7 @@ } - +
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 0f2a76f5410..bee7cc790e9 100644 --- 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 diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp index 5ab23b4d813..0f1157d857b 100644 --- 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 diff --git a/layout/reftests/bugs/368020-1-ref.html b/layout/reftests/bugs/368020-1-ref.html index b8512cc0e45..d6edf2c3991 100644 --- a/layout/reftests/bugs/368020-1-ref.html +++ b/layout/reftests/bugs/368020-1-ref.html @@ -5,7 +5,7 @@ -
+
diff --git a/layout/reftests/bugs/368020-1.html b/layout/reftests/bugs/368020-1.html index f79362274a1..65a6370ce47 100644 --- a/layout/reftests/bugs/368020-1.html +++ b/layout/reftests/bugs/368020-1.html @@ -5,7 +5,7 @@ -
+
diff --git a/layout/reftests/bugs/379349-2-ref.xhtml b/layout/reftests/bugs/379349-2-ref.xhtml index 55e9c98cb49..8333f7626f3 100644 --- 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; } diff --git a/layout/reftests/bugs/379349-2a.xhtml b/layout/reftests/bugs/379349-2a.xhtml index efecf7398ee..96cf828a5b7 100644 --- 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; } diff --git a/layout/reftests/bugs/379349-2b.xhtml b/layout/reftests/bugs/379349-2b.xhtml index 6c4201eff06..09daa1827ab 100644 --- 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; } diff --git a/layout/reftests/bugs/563584-9c.html b/layout/reftests/bugs/563584-9c.html index 46e22b2ef4f..8018b36e5a8 100644 --- a/layout/reftests/bugs/563584-9c.html +++ b/layout/reftests/bugs/563584-9c.html @@ -1,6 +1,6 @@ Test for pushing of floats to next column when float breaking in columns is disabled - +
diff --git a/layout/reftests/bugs/563584-9d.html b/layout/reftests/bugs/563584-9d.html index 0317e5923eb..ed6727586db 100644 --- a/layout/reftests/bugs/563584-9d.html +++ b/layout/reftests/bugs/563584-9d.html @@ -1,6 +1,6 @@ Test for pushing of floats to next column when float breaking in columns is disabled - +
diff --git a/layout/reftests/columns/ahem.css b/layout/reftests/columns/ahem.css deleted file mode 100644 index 884a41198b8..00000000000 --- a/layout/reftests/columns/ahem.css +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: "Ahem"; - src: url(../fonts/Ahem.ttf); -} diff --git a/layout/reftests/columns/columnfill-auto-ref.html b/layout/reftests/columns/columnfill-auto-ref.html deleted file mode 100644 index 619ef7f7b59..00000000000 --- a/layout/reftests/columns/columnfill-auto-ref.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - -
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Sed feugiat libero vel diam.Pellentesque pulvinar commodo lacus. Sed fringilla. Sed lectus. Praesent laoreet orcivitae nisi. Duis venenatis tristique massa. Sed commodo diam at mauris.
- diff --git a/layout/reftests/columns/columnfill-auto.html b/layout/reftests/columns/columnfill-auto.html deleted file mode 100644 index 943e0293813..00000000000 --- a/layout/reftests/columns/columnfill-auto.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -
-
- 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. -
-
- - diff --git a/layout/reftests/columns/columnfill-balance-ref.html b/layout/reftests/columns/columnfill-balance-ref.html deleted file mode 100644 index 51284a681cc..00000000000 --- a/layout/reftests/columns/columnfill-balance-ref.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - -
- 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. -
- - diff --git a/layout/reftests/columns/columnfill-balance.html b/layout/reftests/columns/columnfill-balance.html deleted file mode 100644 index 27aafb3d6a9..00000000000 --- a/layout/reftests/columns/columnfill-balance.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - -
- 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. -
- - diff --git a/layout/reftests/columns/columnfill-change-ref.html b/layout/reftests/columns/columnfill-change-ref.html deleted file mode 100644 index d85b82f4d9c..00000000000 --- a/layout/reftests/columns/columnfill-change-ref.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - Bug 695222: Test for change of column-fill property REFERENCE - - - - - Mozilla Bug 695222 -
-
- 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. -
-
- - diff --git a/layout/reftests/columns/columnfill-change.html b/layout/reftests/columns/columnfill-change.html deleted file mode 100644 index 2ea9d9f0113..00000000000 --- a/layout/reftests/columns/columnfill-change.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Bug 695222: Test for change of column-fill property - - - - - Mozilla Bug 695222 -
-
- 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. -
-
- - diff --git a/layout/reftests/columns/columnfill-overflow-style-ref.html b/layout/reftests/columns/columnfill-overflow-style-ref.html deleted file mode 100644 index faa69de1cdd..00000000000 --- a/layout/reftests/columns/columnfill-overflow-style-ref.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Bug 715203: Multicolumn support in scrolled columns - - - -
-
  • one -
  • two -
  • three -
    • - - diff --git a/layout/reftests/columns/columnfill-overflow-style.html b/layout/reftests/columns/columnfill-overflow-style.html deleted file mode 100644 index 536a6a6fe75..00000000000 --- a/layout/reftests/columns/columnfill-overflow-style.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - Bug 715203: Multicolumn support in scrolled columns - - - -
    -
  • one -
  • two -
  • three -
    • - - diff --git a/layout/reftests/columns/reftest.list b/layout/reftests/columns/reftest.list index 93f64903cf8..a6fae9db23d 100644 --- 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 diff --git a/layout/reftests/pagination/abspos-overflow-01-cols.xhtml b/layout/reftests/pagination/abspos-overflow-01-cols.xhtml index 71eb6e68c1e..1d9baf053de 100644 --- 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; } diff --git a/layout/reftests/pagination/border-breaking-000-cols.xhtml b/layout/reftests/pagination/border-breaking-000-cols.xhtml index 91283dc1620..0f8c52f9ef3 100644 --- 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; } diff --git a/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml b/layout/reftests/pagination/border-breaking-001-cols.ref.xhtml index 37b035e3dff..0673dcca0fc 100644 --- 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; diff --git a/layout/reftests/pagination/border-breaking-001-cols.xhtml b/layout/reftests/pagination/border-breaking-001-cols.xhtml index 5eeee0665c8..88feaa6ab19 100644 --- 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; } diff --git a/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml b/layout/reftests/pagination/border-breaking-002-cols.ref.xhtml index 2c1c1d28642..9e5c989b10e 100644 --- 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; } diff --git a/layout/reftests/pagination/border-breaking-002-cols.xhtml b/layout/reftests/pagination/border-breaking-002-cols.xhtml index 0090702226d..d80cb73b34a 100644 --- 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; } diff --git a/layout/reftests/pagination/border-breaking-003-cols.xhtml b/layout/reftests/pagination/border-breaking-003-cols.xhtml index 1fbb7ff28a1..16095168d56 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-002.ref.xhtml b/layout/reftests/pagination/content-inserted-002.ref.xhtml index c8bfaf8f4db..a2a4f77afa7 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-002.xhtml b/layout/reftests/pagination/content-inserted-002.xhtml index 2cddd6d1b97..f5907f63990 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-003.xhtml b/layout/reftests/pagination/content-inserted-003.xhtml index 365194fee6b..913b82646f2 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-004.xhtml b/layout/reftests/pagination/content-inserted-004.xhtml index d303d8ed716..2148be98776 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-005.xhtml b/layout/reftests/pagination/content-inserted-005.xhtml index 1947b3cdbcb..f83f4d43311 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-006.xhtml b/layout/reftests/pagination/content-inserted-006.xhtml index fbb4c95a7fb..513638577d4 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-007.xhtml b/layout/reftests/pagination/content-inserted-007.xhtml index 0a447ae998d..f7e217914cb 100644 --- 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; } diff --git a/layout/reftests/pagination/content-inserted-009.xhtml b/layout/reftests/pagination/content-inserted-009.xhtml index 1bb95d79288..031b27217b9 100644 --- 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; } diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h index 4e346cfc1fa..35bc1d6ccf3 100644 --- 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) diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h index ea5788c3a7c..145bacfdeb2 100644 --- 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, diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 34f5733f99e..5f22b6c171f 100644 --- 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) { diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h index 5de8d39d6bd..b3a58b710de 100644 --- 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[]; diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index bbd464e68e6..e9846654b74 100644 --- 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), diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h index 4fd48026c98..145f0a9f4f8 100644 --- 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(); diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index a5839ad4220..2833c23d183 100644 --- 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) } diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 1a74d8188b5..ad09a187d15 100644 --- 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() || diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index fc38af6eea5..e492b9d0660 100644 --- 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; diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js index 515c2d0ffd5..8b031cd2e74 100644 --- 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, diff --git a/layout/style/ua.css b/layout/style/ua.css index 21f5c5e6b1c..287370ac8d9 100644 --- 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;