Bug 1397119 - Part 1: Change nsTable*Frame::Get*BorderWidth() return values from nscoord to BCPixelSize. r=dbaron

Differential Revision: https://phabricator.services.mozilla.com/D5368

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris Peterson 2018-09-10 19:51:52 +00:00
parent 7927ab927e
commit e1e83dc65c
3 changed files with 10 additions and 8 deletions

View File

@ -86,8 +86,8 @@ public:
/** convenience method, calls into cellmap */
int32_t Count() const;
nscoord GetIStartBorderWidth() const { return mIStartBorderWidth; }
nscoord GetIEndBorderWidth() const { return mIEndBorderWidth; }
BCPixelSize GetIStartBorderWidth() const { return mIStartBorderWidth; }
BCPixelSize GetIEndBorderWidth() const { return mIEndBorderWidth; }
void SetIStartBorderWidth(BCPixelSize aWidth) { mIStartBorderWidth = aWidth; }
void SetIEndBorderWidth(BCPixelSize aWidth) { mIEndBorderWidth = aWidth; }

View File

@ -5830,7 +5830,7 @@ BCMapCellInfo::SetIEndBorderWidths(BCPixelSize aWidth)
if (mEndCol) {
BCPixelSize half = BC_BORDER_START_HALF(aWidth);
mEndCol->SetIEndBorderWidth(
std::max(nscoord(half), mEndCol->GetIEndBorderWidth()));
std::max(half, mEndCol->GetIEndBorderWidth()));
}
}
@ -5845,9 +5845,10 @@ BCMapCellInfo::SetBEndBorderWidths(BCPixelSize aWidth)
if (mEndRow) {
BCPixelSize half = BC_BORDER_START_HALF(aWidth);
mEndRow->SetBEndBCBorderWidth(
std::max(nscoord(half), mEndRow->GetBEndBCBorderWidth()));
std::max(half, mEndRow->GetBEndBCBorderWidth()));
}
}
void
BCMapCellInfo::SetBStartBorderWidths(BCPixelSize aWidth)
{
@ -5858,9 +5859,10 @@ BCMapCellInfo::SetBStartBorderWidths(BCPixelSize aWidth)
if (mStartRow) {
BCPixelSize half = BC_BORDER_END_HALF(aWidth);
mStartRow->SetBStartBCBorderWidth(
std::max(nscoord(half), mStartRow->GetBStartBCBorderWidth()));
std::max(half, mStartRow->GetBStartBCBorderWidth()));
}
}
void
BCMapCellInfo::SetIStartBorderWidths(BCPixelSize aWidth)
{
@ -5871,7 +5873,7 @@ BCMapCellInfo::SetIStartBorderWidths(BCPixelSize aWidth)
if (mStartCol) {
BCPixelSize half = BC_BORDER_END_HALF(aWidth);
mStartCol->SetIStartBorderWidth(
std::max(nscoord(half), mStartCol->GetIStartBorderWidth()));
std::max(half, mStartCol->GetIStartBorderWidth()));
}
}

View File

@ -211,8 +211,8 @@ public:
nscoord GetUnpaginatedBSize();
void SetUnpaginatedBSize(nsPresContext* aPresContext, nscoord aValue);
nscoord GetBStartBCBorderWidth() const { return mBStartBorderWidth; }
nscoord GetBEndBCBorderWidth() const { return mBEndBorderWidth; }
BCPixelSize GetBStartBCBorderWidth() const { return mBStartBorderWidth; }
BCPixelSize GetBEndBCBorderWidth() const { return mBEndBorderWidth; }
void SetBStartBCBorderWidth(BCPixelSize aWidth) { mBStartBorderWidth = aWidth; }
void SetBEndBCBorderWidth(BCPixelSize aWidth) { mBEndBorderWidth = aWidth; }
mozilla::LogicalMargin GetBCBorderWidth(mozilla::WritingMode aWM);