Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 961364 - Clear the column type bits before setting them in nsTableCol{,Group}Frame::SetColType. r=dbaron

Browse Source
This commit is contained in:
Cameron McCormack 2014-02-18 13:32:06 +11:00
parent ce912be374
commit 415a94a6de
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/tables/nsTableColFrame.cpp
View File

@ -47,7 +47,8 @@ nsTableColFrame::SetColType(nsTableColType aType)
GetPrevContinuation()->GetNextSibling() == this),
"spanned content cols must be continuations");
uint32_t type = aType - eColContent;
mState |= nsFrameState(type << COL_TYPE_OFFSET);
RemoveStateBits(COL_TYPE_BITS);
AddStateBits(nsFrameState(type << COL_TYPE_OFFSET));
}
/* virtual */ void

6
layout/tables/nsTableColGroupFrame.cpp
View File

@ -26,8 +26,12 @@ nsTableColGroupFrame::GetColType() const
void nsTableColGroupFrame::SetColType(nsTableColGroupType aType)
{
NS_ASSERTION(GetColType() == eColGroupContent,
"should only call nsTableColGroupFrame::SetColType with aType "
"!= eColGroupContent once");
uint32_t type = aType - eColGroupContent;
mState |= nsFrameState(type << COL_GROUP_TYPE_OFFSET);
RemoveStateBits(COL_GROUP_TYPE_BITS);
AddStateBits(nsFrameState(type << COL_GROUP_TYPE_OFFSET));
}
void nsTableColGroupFrame::ResetColIndices(nsIFrame* aFirstColGroup,