зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1181087 - part 2 - Remove the unused physical setter methods on logical-coordinate classes. r=smontagu
This commit is contained in:
Родитель
07b0efa156
Коммит
e467a5abeb
|
@ -704,28 +704,6 @@ public:
|
|||
return mPoint.y;
|
||||
}
|
||||
|
||||
/**
|
||||
* Setters for the physical coordinates.
|
||||
*/
|
||||
void SetX(WritingMode aWritingMode, nscoord aX, nscoord aContainerWidth)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
B() = aWritingMode.IsVerticalLR() ? aX : aContainerWidth - aX;
|
||||
} else {
|
||||
I() = aWritingMode.IsBidiLTR() ? aX : aContainerWidth - aX;
|
||||
}
|
||||
}
|
||||
void SetY(WritingMode aWritingMode, nscoord aY)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
I() = aY;
|
||||
} else {
|
||||
B() = aY;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a physical point corresponding to our logical coordinates,
|
||||
* converted according to our writing mode.
|
||||
|
@ -929,7 +907,7 @@ public:
|
|||
}
|
||||
|
||||
/**
|
||||
* Writable references to the logical and physical dimensions
|
||||
* Writable references to the logical dimensions
|
||||
*/
|
||||
nscoord& ISize(WritingMode aWritingMode) // inline-size
|
||||
{
|
||||
|
@ -942,17 +920,6 @@ public:
|
|||
return mSize.height;
|
||||
}
|
||||
|
||||
nscoord& Width(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ? BSize() : ISize();
|
||||
}
|
||||
nscoord& Height(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ? ISize() : BSize();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an nsSize containing our physical dimensions
|
||||
*/
|
||||
|
@ -1241,36 +1208,6 @@ public:
|
|||
mMargin.SizeTo(aBStart, aIEnd, aBEnd, aIStart);
|
||||
}
|
||||
|
||||
nscoord& Top(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ?
|
||||
(aWritingMode.IsBidiLTR() ? IStart() : IEnd()) : BStart();
|
||||
}
|
||||
|
||||
nscoord& Bottom(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ?
|
||||
(aWritingMode.IsBidiLTR() ? IEnd() : IStart()) : BEnd();
|
||||
}
|
||||
|
||||
nscoord& Left(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ?
|
||||
(aWritingMode.IsVerticalLR() ? BStart() : BEnd()) :
|
||||
(aWritingMode.IsBidiLTR() ? IStart() : IEnd());
|
||||
}
|
||||
|
||||
nscoord& Right(WritingMode aWritingMode)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ?
|
||||
(aWritingMode.IsVerticalLR() ? BEnd() : BStart()) :
|
||||
(aWritingMode.IsBidiLTR() ? IEnd() : IStart());
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an nsMargin containing our physical coordinates
|
||||
*/
|
||||
|
@ -1571,81 +1508,24 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void SetX(WritingMode aWritingMode, nscoord aX, nscoord aContainerWidth)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
if (aWritingMode.IsVerticalLR()) {
|
||||
BStart() = aX;
|
||||
} else {
|
||||
BStart() = aContainerWidth - aX - BSize();
|
||||
}
|
||||
} else {
|
||||
if (aWritingMode.IsBidiLTR()) {
|
||||
IStart() = aX;
|
||||
} else {
|
||||
IStart() = aContainerWidth - aX - ISize();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nscoord Y(WritingMode aWritingMode) const
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ? mRect.X() : mRect.Y();
|
||||
}
|
||||
|
||||
void SetY(WritingMode aWritingMode, nscoord aY)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
IStart() = aY;
|
||||
} else {
|
||||
BStart() = aY;
|
||||
}
|
||||
}
|
||||
|
||||
nscoord Width(WritingMode aWritingMode) const
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ? mRect.Height() : mRect.Width();
|
||||
}
|
||||
|
||||
// When setting the Width of a rect, we keep its physical X-coord fixed
|
||||
// and modify XMax. This means that in the RTL case, we'll be moving
|
||||
// the IStart, so that IEnd remains constant.
|
||||
void SetWidth(WritingMode aWritingMode, nscoord aWidth)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
if (!aWritingMode.IsVerticalLR()) {
|
||||
BStart() = BStart() + BSize() - aWidth;
|
||||
}
|
||||
BSize() = aWidth;
|
||||
} else {
|
||||
if (!aWritingMode.IsBidiLTR()) {
|
||||
IStart() = IStart() + ISize() - aWidth;
|
||||
}
|
||||
ISize() = aWidth;
|
||||
}
|
||||
}
|
||||
|
||||
nscoord Height(WritingMode aWritingMode) const
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
return aWritingMode.IsVertical() ? mRect.Width() : mRect.Height();
|
||||
}
|
||||
|
||||
void SetHeight(WritingMode aWritingMode, nscoord aHeight)
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
if (aWritingMode.IsVertical()) {
|
||||
ISize() = aHeight;
|
||||
} else {
|
||||
BSize() = aHeight;
|
||||
}
|
||||
}
|
||||
|
||||
nscoord XMost(WritingMode aWritingMode, nscoord aContainerWidth) const
|
||||
{
|
||||
CHECK_WRITING_MODE(aWritingMode);
|
||||
|
|
Загрузка…
Ссылка в новой задаче