зеркало из https://github.com/mozilla/gecko-dev.git
Bug 219908 Remove some layout warnings
r=bz sr=dbaron
This commit is contained in:
Родитель
af62ff6220
Коммит
41c29367c7
|
@ -1599,6 +1599,7 @@ static PRBool BlinkIsAllowed(void)
|
|||
return sBlinkIsAllowed;
|
||||
}
|
||||
|
||||
#ifdef FONT_LEADING_APIS_V2
|
||||
static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
|
||||
{
|
||||
if (sNormalLineHeightControl == eUninitialized) {
|
||||
|
@ -1614,6 +1615,7 @@ static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
|
|||
}
|
||||
return sNormalLineHeightControl;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Reset mFlags.mTableDerivedComputedWidth if there is a non percent style width
|
||||
// or if there is a percent style width and the parent has a style width.
|
||||
|
|
|
@ -2282,7 +2282,9 @@ nsTextFrame::PaintUnicodeText(nsIPresContext* aPresContext,
|
|||
nsBidiPresUtils* bidiUtils;
|
||||
aPresContext->GetBidiUtils(&bidiUtils);
|
||||
if (bidiUtils) {
|
||||
#ifdef DEBUG
|
||||
PRInt32 rememberTextLength = textLength;
|
||||
#endif
|
||||
bidiUtils->ReorderUnicodeText(text, textLength,
|
||||
charType, level & 1, isBidiSystem);
|
||||
NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length");
|
||||
|
@ -2970,7 +2972,9 @@ nsTextFrame::PaintTextSlowly(nsIPresContext* aPresContext,
|
|||
(void**) &level,sizeof(level));
|
||||
GetBidiProperty(aPresContext, nsLayoutAtoms::charType,
|
||||
(void**) &charType,sizeof(charType));
|
||||
#ifdef DEBUG
|
||||
PRInt32 rememberTextLength = textLength;
|
||||
#endif
|
||||
// Since we paint char by char, handle the text like on non-bidi platform
|
||||
bidiUtils->ReorderUnicodeText(text, textLength, charType,
|
||||
level & 1, PR_FALSE);
|
||||
|
|
|
@ -1599,6 +1599,7 @@ static PRBool BlinkIsAllowed(void)
|
|||
return sBlinkIsAllowed;
|
||||
}
|
||||
|
||||
#ifdef FONT_LEADING_APIS_V2
|
||||
static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
|
||||
{
|
||||
if (sNormalLineHeightControl == eUninitialized) {
|
||||
|
@ -1614,6 +1615,7 @@ static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
|
|||
}
|
||||
return sNormalLineHeightControl;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Reset mFlags.mTableDerivedComputedWidth if there is a non percent style width
|
||||
// or if there is a percent style width and the parent has a style width.
|
||||
|
|
|
@ -2282,7 +2282,9 @@ nsTextFrame::PaintUnicodeText(nsIPresContext* aPresContext,
|
|||
nsBidiPresUtils* bidiUtils;
|
||||
aPresContext->GetBidiUtils(&bidiUtils);
|
||||
if (bidiUtils) {
|
||||
#ifdef DEBUG
|
||||
PRInt32 rememberTextLength = textLength;
|
||||
#endif
|
||||
bidiUtils->ReorderUnicodeText(text, textLength,
|
||||
charType, level & 1, isBidiSystem);
|
||||
NS_ASSERTION(rememberTextLength == textLength, "Bidi formatting changed text length");
|
||||
|
@ -2970,7 +2972,9 @@ nsTextFrame::PaintTextSlowly(nsIPresContext* aPresContext,
|
|||
(void**) &level,sizeof(level));
|
||||
GetBidiProperty(aPresContext, nsLayoutAtoms::charType,
|
||||
(void**) &charType,sizeof(charType));
|
||||
#ifdef DEBUG
|
||||
PRInt32 rememberTextLength = textLength;
|
||||
#endif
|
||||
// Since we paint char by char, handle the text like on non-bidi platform
|
||||
bidiUtils->ReorderUnicodeText(text, textLength, charType,
|
||||
level & 1, PR_FALSE);
|
||||
|
|
|
@ -289,7 +289,7 @@ nsBoxObject::GetScreenRect(nsRect& aRect)
|
|||
|
||||
if (presContext) {
|
||||
nsIFrame* frame;
|
||||
nsresult rv = presShell->GetPrimaryFrameFor(mContent, &frame);
|
||||
presShell->GetPrimaryFrameFor(mContent, &frame);
|
||||
|
||||
PRInt32 offsetX = 0;
|
||||
PRInt32 offsetY = 0;
|
||||
|
|
|
@ -437,6 +437,7 @@ nsXULTooltipListener::ShowTooltip()
|
|||
}
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
#ifdef DEBUG_crap
|
||||
static void
|
||||
GetTreeCellCoords(nsITreeBoxObject* aTreeBox, nsIContent* aSourceNode,
|
||||
PRInt32 aRow, nsAutoString aCol, PRInt32* aX, PRInt32* aY)
|
||||
|
@ -453,6 +454,7 @@ GetTreeCellCoords(nsITreeBoxObject* aTreeBox, nsIContent* aSourceNode,
|
|||
*aX += myX;
|
||||
*aY += myY;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
SetTitletipLabel(nsITreeBoxObject* aTreeBox, nsIContent* aTooltip,
|
||||
|
|
Загрузка…
Ссылка в новой задаче