mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
Scott Johnson 2012-06-13 11:00:56 -05:00
Родитель 876d0c1ced
Коммит 792e0700cf
49 изменённых файлов: 23 добавлений и 322 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
dom/interfaces/css/nsIDOMCSS2Properties.idl
Просмотреть файл

@ -14,7 +14,7 @@
* http://www.w3.org/TR/DOM-Level-2-Style * 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 interface nsIDOMCSS2Properties : nsISupports
{ {
attribute DOMString background; attribute DOMString background;
@ -498,9 +498,6 @@ interface nsIDOMCSS2Properties : nsISupports
attribute DOMString MozColumnWidth; attribute DOMString MozColumnWidth;
// raises(DOMException) on setting // raises(DOMException) on setting
attribute DOMString MozColumnFill;
// raises(DOMException) on setting
attribute DOMString MozColumnGap; attribute DOMString MozColumnGap;
// raises(DOMException) on setting // raises(DOMException) on setting

3
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_AUTO 0
#define NS_STYLE_COLUMN_COUNT_UNLIMITED (-1) #define NS_STYLE_COLUMN_COUNT_UNLIMITED (-1)
#define NS_STYLE_COLUMN_FILL_AUTO 0
#define NS_STYLE_COLUMN_FILL_BALANCE 1
// See nsStyleUIReset // See nsStyleUIReset
#define NS_STYLE_IME_MODE_AUTO 0 #define NS_STYLE_IME_MODE_AUTO 0
#define NS_STYLE_IME_MODE_NORMAL 1 #define NS_STYLE_IME_MODE_NORMAL 1

1
layout/generic/crashtests/399412-1.html
Просмотреть файл

@ -17,7 +17,6 @@ body {
width: 300px; width: 300px;
-moz-column-width: 50px; -moz-column-width: 50px;
-moz-column-gap: 1px; -moz-column-gap: 1px;
-moz-column-fill: auto;
} }
</style> </style>

2
layout/generic/crashtests/673770.html
Просмотреть файл

@ -13,7 +13,7 @@
} }
</script> </script>
</head> </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> <hr size="100" color="blue"><div style="position: absolute;"></div><div id="x" style="height: 5px;"></div>
</body> </body>
</html> </html>

2
layout/generic/crashtests/crashtests.list
Просмотреть файл

@ -375,7 +375,7 @@ load text-overflow-bug666751-2.html
asserts(0-1) load text-overflow-bug670564.xhtml asserts(0-1) load text-overflow-bug670564.xhtml
load text-overflow-bug671796.xhtml load text-overflow-bug671796.xhtml
load 667025.html 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 679933-1.html
load 682649-1.html load 682649-1.html
load 683702-1.xhtml load 683702-1.xhtml

38
layout/generic/nsColumnSetFrame.cpp
Просмотреть файл

@ -331,21 +331,17 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
nscoord colGap = GetColumnGap(this, colStyle); nscoord colGap = GetColumnGap(this, colStyle);
PRInt32 numColumns = colStyle->mColumnCount; PRInt32 numColumns = colStyle->mColumnCount;
bool isBalancing = colStyle->mColumnFill == NS_STYLE_COLUMN_FILL_BALANCE; const PRUint32 MAX_NESTED_COLUMN_BALANCING = 2;
if (isBalancing) { PRUint32 cnt = 1;
const PRUint32 MAX_NESTED_COLUMN_BALANCING = 2; for (const nsHTMLReflowState* rs = aReflowState.parentReflowState; rs && cnt
PRUint32 cnt = 1; < MAX_NESTED_COLUMN_BALANCING; rs = rs->parentReflowState) {
for (const nsHTMLReflowState* rs = aReflowState.parentReflowState; if (rs->mFlags.mIsColumnBalancing) {
rs && cnt < MAX_NESTED_COLUMN_BALANCING; ++cnt;
rs = rs->parentReflowState) {
if (rs->mFlags.mIsColumnBalancing) {
++cnt;
}
}
if (cnt == MAX_NESTED_COLUMN_BALANCING) {
numColumns = 1;
} }
} }
if (cnt == MAX_NESTED_COLUMN_BALANCING) {
numColumns = 1;
}
nscoord colWidth; nscoord colWidth;
if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) { if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
@ -399,22 +395,18 @@ nsColumnSetFrame::ChooseColumnStrategy(const nsHTMLReflowState& aReflowState)
expectedWidthLeftOver = extraSpace - (extraToColumns*numColumns); expectedWidthLeftOver = extraSpace - (extraToColumns*numColumns);
} }
// If column-fill is set to 'balance', then we want to balance the columns. // NOTE that the non-balancing behavior for non-auto computed height
if (isBalancing) { // is not in the CSS3 columns draft as of 18 January 2001
if (aReflowState.ComputedHeight() == NS_INTRINSICSIZE) {
// Balancing! // Balancing!
if (numColumns <= 0) { if (numColumns <= 0) {
// Hmm, auto column count, column width or available width is unknown, // Hmm, auto column count, column width or available width is unknown,
// and balancing is required. Let's just use one column then. // and balancing is required. Let's just use one column then.
numColumns = 1; numColumns = 1;
} }
colHeight = NS_MIN(mLastBalanceHeight, GetAvailableContentHeight(aReflowState));
colHeight = NS_MIN(mLastBalanceHeight,
GetAvailableContentHeight(aReflowState));
} else { } else {
// This is the case when the column-fill property is set to 'auto'.
// No balancing, so don't limit the column count // No balancing, so don't limit the column count
numColumns = PR_INT32_MAX; numColumns = PR_INT32_MAX;
} }
@ -641,8 +633,8 @@ nsColumnSetFrame::ReflowChildren(nsHTMLReflowMetrics& aDesiredSize,
kidReflowState.mFlags.mIsTopOfPage = true; kidReflowState.mFlags.mIsTopOfPage = true;
kidReflowState.mFlags.mTableIsSplittable = false; kidReflowState.mFlags.mTableIsSplittable = false;
kidReflowState.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < PR_INT32_MAX; kidReflowState.mFlags.mIsColumnBalancing = aConfig.mBalanceColCount < PR_INT32_MAX;
#ifdef DEBUG_roc #ifdef DEBUG_roc
printf("*** Reflowing child #%d %p: availHeight=%d\n", printf("*** Reflowing child #%d %p: availHeight=%d\n",
columnCount, (void*)child,availSize.height); columnCount, (void*)child,availSize.height);
#endif #endif

2
layout/reftests/bugs/368020-1-ref.html
Просмотреть файл

@ -5,7 +5,7 @@
</head> </head>
<body> <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="margin: 7px 1% 2px 2em; border: medium dotted; border-width: 2px 3px 4px 5px;">
<div style="background: url(repeatable-diagonal-gradient.png);"> <div style="background: url(repeatable-diagonal-gradient.png);">

2
layout/reftests/bugs/368020-1.html
Просмотреть файл

@ -5,7 +5,7 @@
</head> </head>
<body> <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>
<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;"> <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;">

1
layout/reftests/bugs/379349-2-ref.xhtml
Просмотреть файл

@ -41,7 +41,6 @@
width: 300pt; width: 300pt;
-moz-column-width: 100pt; -moz-column-width: 100pt;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid gray; border: solid gray;
position: relative; position: relative;
} }

1
layout/reftests/bugs/379349-2a.xhtml
Просмотреть файл

@ -48,7 +48,6 @@
width: 300pt; width: 300pt;
-moz-column-width: 100pt; -moz-column-width: 100pt;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid gray; border: solid gray;
} }
</style> </style>

1
layout/reftests/bugs/379349-2b.xhtml
Просмотреть файл

@ -48,7 +48,6 @@
width: 300pt; width: 300pt;
-moz-column-width: 100pt; -moz-column-width: 100pt;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid gray; border: solid gray;
} }
</style> </style>

2
layout/reftests/bugs/563584-9c.html
Просмотреть файл

@ -1,6 +1,6 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<title>Test for pushing of floats to next column when float breaking in columns is disabled</title> <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="float: left;">
<div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div> <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
</div> </div>

2
layout/reftests/bugs/563584-9d.html
Просмотреть файл

@ -1,6 +1,6 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<title>Test for pushing of floats to next column when float breaking in columns is disabled</title> <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="float: left;">
<div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div> <div style="display: inline-block; vertical-align: top; height: 150px; width: 200px; background: yellow"></div>
</div> </div>

4
layout/reftests/columns/ahem.css
Просмотреть файл

@ -1,4 +0,0 @@
@font-face {
font-family: "Ahem";
src: url(../fonts/Ahem.ttf);
}

32
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>

19
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>

33
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>

16
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>

26
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>

35
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>

21
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>

22
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>

8
layout/reftests/columns/reftest.list
Просмотреть файл

@ -16,15 +16,7 @@
== column-balancing-002.html column-balancing-002.ref.html == column-balancing-002.html column-balancing-002.ref.html
== column-balancing-003.html column-balancing-000.ref.html == column-balancing-003.html column-balancing-000.ref.html
== column-balancing-004.html column-balancing-004.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-basic.html columnrule-basic-ref.html
== columnrule-complex.html columnrule-complex-ref.html == columnrule-complex.html columnrule-complex-ref.html
!= columnrule-linestyles.html columnrule-linestyles-notref.html != columnrule-linestyles.html columnrule-linestyles-notref.html
== columnrule-padding.html columnrule-padding-ref.html == columnrule-padding.html columnrule-padding-ref.html
== columnfill-overflow-style.html columnfill-overflow-style-ref.html

1
layout/reftests/pagination/abspos-overflow-01-cols.xhtml
Просмотреть файл

@ -34,7 +34,6 @@
height: 2in; height: 2in;
-moz-column-count: 3; -moz-column-count: 3;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: silver 2pt; border: silver 2pt;
border-style: none solid; border-style: none solid;
} }

1
layout/reftests/pagination/border-breaking-000-cols.xhtml
Просмотреть файл

@ -25,7 +25,6 @@
width: 300px; width: 300px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
border-style: none solid; border-style: none solid;
} }

1
layout/reftests/pagination/border-breaking-001-cols.ref.xhtml
Просмотреть файл

@ -20,7 +20,6 @@
width: 300px; width: 300px;
-moz-column-width: 100px; -moz-column-width: 100px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
border-style: none solid; border-style: none solid;
background: yellow; background: yellow;

1
layout/reftests/pagination/border-breaking-001-cols.xhtml
Просмотреть файл

@ -49,7 +49,6 @@
width: 300px; width: 300px;
-moz-column-width: 100px; -moz-column-width: 100px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
border-style: none solid; border-style: none solid;
} }

1
layout/reftests/pagination/border-breaking-002-cols.ref.xhtml
Просмотреть файл

@ -16,7 +16,6 @@
width: 300px; width: 300px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
} }
</style> </style>

1
layout/reftests/pagination/border-breaking-002-cols.xhtml
Просмотреть файл

@ -17,7 +17,6 @@
width: 300px; width: 300px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
} }
</style> </style>

1
layout/reftests/pagination/border-breaking-003-cols.xhtml
Просмотреть файл

@ -20,7 +20,6 @@
width: 300px; width: 300px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: solid silver; border: solid silver;
} }
</style> </style>

1
layout/reftests/pagination/content-inserted-002.ref.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-002.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-003.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-004.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-005.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-006.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-007.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/reftests/pagination/content-inserted-009.xhtml
Просмотреть файл

@ -13,7 +13,6 @@
width: 450px; width: 450px;
-moz-column-width: 150px; -moz-column-width: 150px;
-moz-column-gap: 0; -moz-column-gap: 0;
-moz-column-fill: auto;
border: 3px solid silver; border: 3px solid silver;
} }

1
layout/style/nsCSSKeywordList.h
Просмотреть файл

@ -165,7 +165,6 @@ CSS_KEY(auto, auto)
CSS_KEY(avoid, avoid) CSS_KEY(avoid, avoid)
CSS_KEY(background, background) CSS_KEY(background, background)
CSS_KEY(backwards, backwards) CSS_KEY(backwards, backwards)
CSS_KEY(balance, balance)
CSS_KEY(baseline, baseline) CSS_KEY(baseline, baseline)
CSS_KEY(bidi-override, bidi_override) CSS_KEY(bidi-override, bidi_override)
CSS_KEY(blink, blink) CSS_KEY(blink, blink)

10
layout/style/nsCSSPropList.h
Просмотреть файл

@ -1377,16 +1377,6 @@ CSS_PROP_COLUMN(
nsnull, nsnull,
offsetof(nsStyleColumn, mColumnCount), offsetof(nsStyleColumn, mColumnCount),
eStyleAnimType_Custom) 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( CSS_PROP_COLUMN(
-moz-column-width, -moz-column-width,
_moz_column_width, _moz_column_width,

6
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -1496,12 +1496,6 @@ const PRInt32 nsCSSProps::kColorInterpolationKTable[] = {
eCSSKeyword_UNKNOWN, -1 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 bool
nsCSSProps::FindKeyword(nsCSSKeyword aKeyword, const PRInt32 aTable[], PRInt32& aResult) nsCSSProps::FindKeyword(nsCSSKeyword aKeyword, const PRInt32 aTable[], PRInt32& aResult)
{ {

1
layout/style/nsCSSProps.h
Просмотреть файл

@ -338,7 +338,6 @@ public:
static const PRInt32 kTextAnchorKTable[]; static const PRInt32 kTextAnchorKTable[];
static const PRInt32 kTextRenderingKTable[]; static const PRInt32 kTextRenderingKTable[];
static const PRInt32 kColorInterpolationKTable[]; static const PRInt32 kColorInterpolationKTable[];
static const PRInt32 kColumnFillKTable[];
static const PRInt32 kBoxPropSourceKTable[]; static const PRInt32 kBoxPropSourceKTable[];
static const PRInt32 kBoxShadowTypeKTable[]; static const PRInt32 kBoxShadowTypeKTable[];
static const PRInt32 kBoxSizingKTable[]; static const PRInt32 kBoxSizingKTable[];

11
layout/style/nsComputedDOMStyle.cpp
Просмотреть файл

@ -719,16 +719,6 @@ nsComputedDOMStyle::DoGetColumnGap()
return val; return val;
} }
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetColumnFill()
{
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
val->SetIdent(
nsCSSProps::ValueToKeywordEnum(GetStyleColumn()->mColumnFill,
nsCSSProps::kColumnFillKTable));
return val;
}
nsIDOMCSSValue* nsIDOMCSSValue*
nsComputedDOMStyle::DoGetColumnRuleWidth() nsComputedDOMStyle::DoGetColumnRuleWidth()
{ {
@ -4637,7 +4627,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(box_pack, BoxPack), COMPUTED_STYLE_MAP_ENTRY(box_pack, BoxPack),
COMPUTED_STYLE_MAP_ENTRY(box_sizing, BoxSizing), COMPUTED_STYLE_MAP_ENTRY(box_sizing, BoxSizing),
COMPUTED_STYLE_MAP_ENTRY(_moz_column_count, ColumnCount), 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_gap, ColumnGap),
//// COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule, ColumnRule), //// COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule, ColumnRule),
COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule_color, ColumnRuleColor), COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule_color, ColumnRuleColor),

1
layout/style/nsComputedDOMStyle.h
Просмотреть файл

@ -335,7 +335,6 @@ private:
/* Column properties */ /* Column properties */
nsIDOMCSSValue* DoGetColumnCount(); nsIDOMCSSValue* DoGetColumnCount();
nsIDOMCSSValue* DoGetColumnFill();
nsIDOMCSSValue* DoGetColumnWidth(); nsIDOMCSSValue* DoGetColumnWidth();
nsIDOMCSSValue* DoGetColumnGap(); nsIDOMCSSValue* DoGetColumnGap();
nsIDOMCSSValue* DoGetColumnRuleWidth(); nsIDOMCSSValue* DoGetColumnRuleWidth();

7
layout/style/nsRuleNode.cpp
Просмотреть файл

@ -6976,13 +6976,6 @@ nsRuleNode::ComputeColumnData(void* aStartStruct,
column->mColumnRuleColorIsForeground = false; 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) COMPUTE_END_RESET(Column, column)
} }

4
layout/style/nsStyleStruct.cpp
Просмотреть файл

@ -774,7 +774,6 @@ nsStyleColumn::nsStyleColumn(nsPresContext* aPresContext)
mColumnCount = NS_STYLE_COLUMN_COUNT_AUTO; mColumnCount = NS_STYLE_COLUMN_COUNT_AUTO;
mColumnWidth.SetAutoValue(); mColumnWidth.SetAutoValue();
mColumnGap.SetNormalValue(); mColumnGap.SetNormalValue();
mColumnFill = NS_STYLE_COLUMN_FILL_BALANCE;
mColumnRuleWidth = (aPresContext->GetBorderWidthTable())[NS_STYLE_BORDER_WIDTH_MEDIUM]; mColumnRuleWidth = (aPresContext->GetBorderWidthTable())[NS_STYLE_BORDER_WIDTH_MEDIUM];
mColumnRuleStyle = NS_STYLE_BORDER_STYLE_NONE; mColumnRuleStyle = NS_STYLE_BORDER_STYLE_NONE;
@ -806,8 +805,7 @@ nsChangeHint nsStyleColumn::CalcDifference(const nsStyleColumn& aOther) const
return NS_STYLE_HINT_FRAMECHANGE; return NS_STYLE_HINT_FRAMECHANGE;
if (mColumnWidth != aOther.mColumnWidth || if (mColumnWidth != aOther.mColumnWidth ||
mColumnGap != aOther.mColumnGap || mColumnGap != aOther.mColumnGap)
mColumnFill != aOther.mColumnFill)
return NS_STYLE_HINT_REFLOW; return NS_STYLE_HINT_REFLOW;
if (GetComputedColumnRuleWidth() != aOther.GetComputedColumnRuleWidth() || if (GetComputedColumnRuleWidth() != aOther.GetComputedColumnRuleWidth() ||

2
layout/style/nsStyleStruct.h
Просмотреть файл

@ -2077,8 +2077,6 @@ struct nsStyleColumn {
nscolor mColumnRuleColor; // [reset] nscolor mColumnRuleColor; // [reset]
PRUint8 mColumnRuleStyle; // [reset] PRUint8 mColumnRuleStyle; // [reset]
PRUint8 mColumnFill; // [reset] see nsStyleConsts.h
// See https://bugzilla.mozilla.org/show_bug.cgi?id=271586#c43 for why // See https://bugzilla.mozilla.org/show_bug.cgi?id=271586#c43 for why
// this is hard to replace with 'currentColor'. // this is hard to replace with 'currentColor'.
bool mColumnRuleColorIsForeground; bool mColumnRuleColorIsForeground;

8
layout/style/test/property_database.js
Просмотреть файл

@ -517,14 +517,6 @@ var gCSSProperties = {
// negative and zero invalid per editor's draft // negative and zero invalid per editor's draft
invalid_values: [ "-1", "0", "3px" ] 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": { "-moz-column-gap": {
domProp: "MozColumnGap", domProp: "MozColumnGap",
inherited: false, inherited: false,

1
layout/style/ua.css
Просмотреть файл

@ -135,7 +135,6 @@
-moz-column-width: inherit; -moz-column-width: inherit;
-moz-column-gap: inherit; -moz-column-gap: inherit;
-moz-column-rule: inherit; -moz-column-rule: inherit;
-moz-column-fill: inherit;
/* Do not change these. nsCSSFrameConstructor depends on them to create a good /* Do not change these. nsCSSFrameConstructor depends on them to create a good
frame tree. */ frame tree. */
position: static !important; position: static !important;