wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1174711 - patch 3 - Rename a couple more frame-state bits from physical to logical. r=dholbert

Browse Source
This commit is contained in:
Jonathan Kew 2015-06-22 10:33:34 +01:00
parent e125149d03
commit ff1a4563be
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsFrameStateBits.h
View File

@ -550,7 +550,7 @@ FRAME_STATE_BIT(Placeholder, 23, PLACEHOLDER_FOR_POPUP)
FRAME_STATE_GROUP(TableCell, nsTableCellFrame)
FRAME_STATE_BIT(TableCell, 28, NS_TABLE_CELL_HAS_PCT_OVER_HEIGHT)
FRAME_STATE_BIT(TableCell, 28, NS_TABLE_CELL_HAS_PCT_OVER_BSIZE)
FRAME_STATE_BIT(TableCell, 29, NS_TABLE_CELL_HAD_SPECIAL_REFLOW)
FRAME_STATE_BIT(TableCell, 31, NS_TABLE_CELL_CONTENT_EMPTY)
@ -579,10 +579,10 @@ FRAME_STATE_BIT(TableRowAndRowGroup, 28, NS_REPEATED_ROW_OR_ROWGROUP)
FRAME_STATE_GROUP(TableRow, nsTableRowFrame)
// Indicates whether this row has any cells that have
// non-auto-height and rowspan=1
FRAME_STATE_BIT(TableRow, 29, NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT)
// non-auto-bsize and rowspan=1
FRAME_STATE_BIT(TableRow, 29, NS_ROW_HAS_CELL_WITH_STYLE_BSIZE)
FRAME_STATE_BIT(TableRow, 30, NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT)
FRAME_STATE_BIT(TableRow, 30, NS_TABLE_ROW_HAS_UNPAGINATED_BSIZE)
// == Frame state bits that apply to table row group frames ===================
@ -590,7 +590,7 @@ FRAME_STATE_BIT(TableRow, 30, NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT)
FRAME_STATE_GROUP(TableRowGroup, nsTableRowGroupFrame)
FRAME_STATE_BIT(TableRowGroup, 27, NS_ROWGROUP_HAS_ROW_CURSOR)
FRAME_STATE_BIT(TableRowGroup, 30, NS_ROWGROUP_HAS_STYLE_HEIGHT)
FRAME_STATE_BIT(TableRowGroup, 30, NS_ROWGROUP_HAS_STYLE_BSIZE)
// thead or tfoot should be repeated on every printed page
FRAME_STATE_BIT(TableRowGroup, 31, NS_ROWGROUP_REPEATABLE)

2
layout/tables/nsTableCellFrame.cpp
View File

@ -134,7 +134,7 @@ nsTableCellFrame::NotifyPercentBSize(const nsHTMLReflowState& aReflowState)
if (nsTableFrame::AncestorsHaveStyleBSize(*cellRS) ||
(GetTableFrame()->GetEffectiveRowSpan(*this) == 1 &&
(cellRS->parentReflowState->frame->GetStateBits() &
NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT))) {
NS_ROW_HAS_CELL_WITH_STYLE_BSIZE))) {
for (const nsHTMLReflowState *rs = aReflowState.parentReflowState;
rs != cellRS;

8
layout/tables/nsTableCellFrame.h
View File

@ -294,16 +294,16 @@ inline void nsTableCellFrame::SetContentEmpty(bool aContentEmpty)
inline bool nsTableCellFrame::HasPctOverBSize()
{
return (mState & NS_TABLE_CELL_HAS_PCT_OVER_HEIGHT) ==
NS_TABLE_CELL_HAS_PCT_OVER_HEIGHT;
return (mState & NS_TABLE_CELL_HAS_PCT_OVER_BSIZE) ==
NS_TABLE_CELL_HAS_PCT_OVER_BSIZE;
}
inline void nsTableCellFrame::SetHasPctOverBSize(bool aValue)
{
if (aValue) {
mState |= NS_TABLE_CELL_HAS_PCT_OVER_HEIGHT;
mState |= NS_TABLE_CELL_HAS_PCT_OVER_BSIZE;
} else {
mState &= ~NS_TABLE_CELL_HAS_PCT_OVER_HEIGHT;
mState &= ~NS_TABLE_CELL_HAS_PCT_OVER_BSIZE;
}
}

8
layout/tables/nsTableRowFrame.cpp
View File

@ -1449,8 +1449,8 @@ nsTableRowFrame::AccessibleType()
}
#endif
/**
* Sets the NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT bit to indicate whether
* this row has any cells that have non-auto-height. (Row-spanning
* Sets the NS_ROW_HAS_CELL_WITH_STYLE_BSIZE bit to indicate whether
* this row has any cells that have non-auto-bsize. (Row-spanning
* cells are ignored.)
*/
void nsTableRowFrame::InitHasCellWithStyleBSize(nsTableFrame* aTableFrame)
@ -1470,11 +1470,11 @@ void nsTableRowFrame::InitHasCellWithStyleBSize(nsTableFrame* aTableFrame)
cellBSize.GetUnit() != eStyleUnit_Auto &&
/* calc() with percentages treated like 'auto' */
(!cellBSize.IsCalcUnit() || !cellBSize.HasPercent())) {
AddStateBits(NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT);
AddStateBits(NS_ROW_HAS_CELL_WITH_STYLE_BSIZE);
return;
}
}
RemoveStateBits(NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT);
RemoveStateBits(NS_ROW_HAS_CELL_WITH_STYLE_BSIZE);
}
void

12
layout/tables/nsTableRowFrame.h
View File

@ -310,8 +310,8 @@ private:
BCPixelSize mIStartContBorderWidth;
/**
* Sets the NS_ROW_HAS_CELL_WITH_STYLE_HEIGHT bit to indicate whether
* this row has any cells that have non-auto-height. (Row-spanning
* Sets the NS_ROW_HAS_CELL_WITH_STYLE_BSIZE bit to indicate whether
* this row has any cells that have non-auto-bsize. (Row-spanning
* cells are ignored.)
*/
void InitHasCellWithStyleBSize(nsTableFrame* aTableFrame);
@ -391,16 +391,16 @@ inline float nsTableRowFrame::GetPctBSize() const
inline bool nsTableRowFrame::HasUnpaginatedBSize()
{
return (mState & NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT) ==
NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT;
return (mState & NS_TABLE_ROW_HAS_UNPAGINATED_BSIZE) ==
NS_TABLE_ROW_HAS_UNPAGINATED_BSIZE;
}
inline void nsTableRowFrame::SetHasUnpaginatedBSize(bool aValue)
{
if (aValue) {
mState |= NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT;
mState |= NS_TABLE_ROW_HAS_UNPAGINATED_BSIZE;
} else {
mState &= ~NS_TABLE_ROW_HAS_UNPAGINATED_HEIGHT;
mState &= ~NS_TABLE_ROW_HAS_UNPAGINATED_BSIZE;
}
}

6
layout/tables/nsTableRowGroupFrame.h
View File

@ -443,15 +443,15 @@ inline void nsTableRowGroupFrame::SetRepeatable(bool aRepeatable)
inline bool nsTableRowGroupFrame::HasStyleBSize() const
{
return (mState & NS_ROWGROUP_HAS_STYLE_HEIGHT) == NS_ROWGROUP_HAS_STYLE_HEIGHT;
return (mState & NS_ROWGROUP_HAS_STYLE_BSIZE) == NS_ROWGROUP_HAS_STYLE_BSIZE;
}
inline void nsTableRowGroupFrame::SetHasStyleBSize(bool aValue)
{
if (aValue) {
mState |= NS_ROWGROUP_HAS_STYLE_HEIGHT;
mState |= NS_ROWGROUP_HAS_STYLE_BSIZE;
} else {
mState &= ~NS_ROWGROUP_HAS_STYLE_HEIGHT;
mState &= ~NS_ROWGROUP_HAS_STYLE_BSIZE;
}
}