diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 14e385431d7..50a1f8472d0 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -559,7 +559,7 @@ nsComboboxControlFrame::PaintComboboxControl(nsIPresContext& aPresContext, aRenderingContext.SetColor(blkColor->mColor); - aRenderingContext.DrawString(mTextStr, x, y, 0); + aRenderingContext.DrawString(mTextStr, x, y); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, aDirtyRect, inside, *blkSpacing, blkStyle, 0); diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp index 51d07828c17..2e9cb2a095e 100644 --- a/mozilla/layout/forms/nsFormControlFrame.cpp +++ b/mozilla/layout/forms/nsFormControlFrame.cpp @@ -1169,7 +1169,7 @@ nsFormControlFrame::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); diff --git a/mozilla/layout/forms/nsFormControlHelper.cpp b/mozilla/layout/forms/nsFormControlHelper.cpp index 1fa3d35e88a..77a52c2e2ec 100644 --- a/mozilla/layout/forms/nsFormControlHelper.cpp +++ b/mozilla/layout/forms/nsFormControlHelper.cpp @@ -780,7 +780,7 @@ nsFormControlHelper::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); @@ -1301,7 +1301,7 @@ nsFormControlHelper::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 9812916497a..870c943feef 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -639,7 +639,7 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, text.Append("*"); } } - aRenderingContext.DrawString(text, x, y, 0); + aRenderingContext.DrawString(text, x, y); } else { float sbWidth; float sbHeight; @@ -664,11 +664,11 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, nsString substr; if (-1 == pos) { text.Right(substr, text.Length()-oldPos); - aRenderingContext.DrawString(substr, x, y, 0); + aRenderingContext.DrawString(substr, x, y); break; } text.Left(substr, pos); - aRenderingContext.DrawString(substr, x, y, 0); + aRenderingContext.DrawString(substr, x, y); y += textHeight; pos++; oldPos = pos; diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index d45b3efc8ab..8f3aea56c51 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/layout/generic/nsBulletFrame.cpp @@ -149,8 +149,7 @@ nsBulletFrame::Paint(nsIPresContext& aCX, fm = aCX.GetMetricsFor(myFont->mFont); GetListItemText(aCX, *myList, text); aRenderingContext.SetFont(fm); - aRenderingContext.GetWidth(text, width); - aRenderingContext.DrawString(text, mPadding.left, mPadding.top, width); + aRenderingContext.DrawString(text, mPadding.left, mPadding.top); NS_RELEASE(fm); break; } diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 82ad285eb4d..b37f8c5b656 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -531,7 +531,7 @@ nsImageFrame::DisplayAltText(nsIPresContext& aPresContext, nscoord width = MeasureString(str, strLen, aRect.width, maxFit, aRenderingContext); // Display the text - aRenderingContext.DrawString(str, maxFit, aRect.x, y, 0); + aRenderingContext.DrawString(str, maxFit, aRect.x, y); // Move to the next line str += maxFit; diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 9c894a779e9..b4108a69458 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -677,7 +677,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if (nsnull != atom) { atom->ToString(tmp); NS_RELEASE(atom); - aRenderingContext.DrawString(tmp, px3, px3, 0); + aRenderingContext.DrawString(tmp, px3, px3); } } return NS_OK; diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 2b10fc53fda..85843a7ad13 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -806,7 +806,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, //if selection is > content length then selection has "slid off" // When there is no selection showing, use the fastest and // simplest rendering approach - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); } @@ -834,7 +834,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, selectionOffset = ip[selectionOffset] - mContentOffset; selectionEnd = ip[selectionEnd] - mContentOffset; if (selectionOffset == selectionEnd){ - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); // aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth); @@ -851,8 +851,8 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, // Render first (unselected) section aRenderingContext.GetWidth(text, PRUint32(selectionOffset),//si.mStartOffset), textWidth); - aRenderingContext.DrawString(text, selectionOffset, - x, dy, textWidth); + aRenderingContext.DrawString(text, PRUint32(selectionOffset), + x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); x += textWidth; @@ -868,7 +868,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, aRenderingContext.FillRect(x, dy, textWidth, mRect.height); aRenderingContext.SetColor(aTextStyle.mSelectionTextColor); aRenderingContext.DrawString(text + selectionOffset, - secondLen, x, dy, textWidth); + PRUint32(secondLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); aRenderingContext.SetColor(aTextStyle.mColor->mColor); @@ -881,7 +881,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, aRenderingContext.GetWidth(text + selectionEnd, PRUint32(thirdLen), textWidth); aRenderingContext.DrawString(text + selectionEnd, - thirdLen, x, dy, textWidth); + PRUint32(thirdLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); } @@ -988,7 +988,7 @@ TextFrame::RenderString(nsIRenderingContext& aRenderingContext, if (0 != pendingCount) { // Measure previous run of characters using the previous font aRenderingContext.DrawString(runStart, pendingCount, - aX, lastY, width, + aX, lastY, -1, spacing ? sp0 : nsnull); // Note: use aY not small-y so that decorations are drawn with @@ -1013,7 +1013,7 @@ TextFrame::RenderString(nsIRenderingContext& aRenderingContext, pendingCount = bp - runStart; if (0 != pendingCount) { // Measure previous run of characters using the previous font - aRenderingContext.DrawString(runStart, pendingCount, aX, lastY, width, + aRenderingContext.DrawString(runStart, pendingCount, aX, lastY, -1, spacing ? sp0 : nsnull); // Note: use aY not small-y so that decorations are drawn with @@ -1274,7 +1274,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, //if selection is > content length then selection has "slid off" // When there is no selection showing, use the fastest and // simplest rendering approach - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); } @@ -1302,7 +1302,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, selectionOffset = ip[selectionOffset] - mContentOffset; selectionEnd = ip[selectionEnd] - mContentOffset; if (selectionOffset == selectionEnd){ - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); // aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth); @@ -1319,8 +1319,8 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, // Render first (unselected) section aRenderingContext.GetWidth(text, PRUint32(selectionOffset),//si.mStartOffset), textWidth); - aRenderingContext.DrawString(text, selectionOffset, - x, dy, textWidth); + aRenderingContext.DrawString(text, PRUint32(selectionOffset), + x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); x += textWidth; @@ -1336,7 +1336,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, aRenderingContext.FillRect(x, dy, textWidth, mRect.height); aRenderingContext.SetColor(aTextStyle.mSelectionTextColor); aRenderingContext.DrawString(text + selectionOffset, - secondLen, x, dy, textWidth); + PRUint32(secondLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); aRenderingContext.SetColor(aTextStyle.mColor->mColor); @@ -1349,7 +1349,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, aRenderingContext.GetWidth(text + selectionEnd, PRUint32(thirdLen), textWidth); aRenderingContext.DrawString(text + selectionEnd, - thirdLen, x, dy, textWidth); + PRUint32(thirdLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); } diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index d45b3efc8ab..8f3aea56c51 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/layout/html/base/src/nsBulletFrame.cpp @@ -149,8 +149,7 @@ nsBulletFrame::Paint(nsIPresContext& aCX, fm = aCX.GetMetricsFor(myFont->mFont); GetListItemText(aCX, *myList, text); aRenderingContext.SetFont(fm); - aRenderingContext.GetWidth(text, width); - aRenderingContext.DrawString(text, mPadding.left, mPadding.top, width); + aRenderingContext.DrawString(text, mPadding.left, mPadding.top); NS_RELEASE(fm); break; } diff --git a/mozilla/layout/html/base/src/nsHTMLImage.cpp b/mozilla/layout/html/base/src/nsHTMLImage.cpp index 4505deb9d41..a97401d9348 100644 --- a/mozilla/layout/html/base/src/nsHTMLImage.cpp +++ b/mozilla/layout/html/base/src/nsHTMLImage.cpp @@ -566,7 +566,7 @@ ImageFrame::DisplayAltText(nsIPresContext& aPresContext, nscoord width = MeasureString(fm, str, strLen, aRect.width, maxFit); // Display the text - aRenderingContext.DrawString(str, maxFit, aRect.x, y, 0); + aRenderingContext.DrawString(str, maxFit, aRect.x, y); // Move to the next line str += maxFit; diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 82ad285eb4d..b37f8c5b656 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -531,7 +531,7 @@ nsImageFrame::DisplayAltText(nsIPresContext& aPresContext, nscoord width = MeasureString(str, strLen, aRect.width, maxFit, aRenderingContext); // Display the text - aRenderingContext.DrawString(str, maxFit, aRect.x, y, 0); + aRenderingContext.DrawString(str, maxFit, aRect.x, y); // Move to the next line str += maxFit; diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 9c894a779e9..b4108a69458 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -677,7 +677,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext, if (nsnull != atom) { atom->ToString(tmp); NS_RELEASE(atom); - aRenderingContext.DrawString(tmp, px3, px3, 0); + aRenderingContext.DrawString(tmp, px3, px3); } } return NS_OK; diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 2b10fc53fda..85843a7ad13 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -806,7 +806,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, //if selection is > content length then selection has "slid off" // When there is no selection showing, use the fastest and // simplest rendering approach - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); } @@ -834,7 +834,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, selectionOffset = ip[selectionOffset] - mContentOffset; selectionEnd = ip[selectionEnd] - mContentOffset; if (selectionOffset == selectionEnd){ - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); // aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth); @@ -851,8 +851,8 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, // Render first (unselected) section aRenderingContext.GetWidth(text, PRUint32(selectionOffset),//si.mStartOffset), textWidth); - aRenderingContext.DrawString(text, selectionOffset, - x, dy, textWidth); + aRenderingContext.DrawString(text, PRUint32(selectionOffset), + x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); x += textWidth; @@ -868,7 +868,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, aRenderingContext.FillRect(x, dy, textWidth, mRect.height); aRenderingContext.SetColor(aTextStyle.mSelectionTextColor); aRenderingContext.DrawString(text + selectionOffset, - secondLen, x, dy, textWidth); + PRUint32(secondLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); aRenderingContext.SetColor(aTextStyle.mColor->mColor); @@ -881,7 +881,7 @@ TextFrame::PaintUnicodeText(nsIPresContext& aPresContext, aRenderingContext.GetWidth(text + selectionEnd, PRUint32(thirdLen), textWidth); aRenderingContext.DrawString(text + selectionEnd, - thirdLen, x, dy, textWidth); + PRUint32(thirdLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); } @@ -988,7 +988,7 @@ TextFrame::RenderString(nsIRenderingContext& aRenderingContext, if (0 != pendingCount) { // Measure previous run of characters using the previous font aRenderingContext.DrawString(runStart, pendingCount, - aX, lastY, width, + aX, lastY, -1, spacing ? sp0 : nsnull); // Note: use aY not small-y so that decorations are drawn with @@ -1013,7 +1013,7 @@ TextFrame::RenderString(nsIRenderingContext& aRenderingContext, pendingCount = bp - runStart; if (0 != pendingCount) { // Measure previous run of characters using the previous font - aRenderingContext.DrawString(runStart, pendingCount, aX, lastY, width, + aRenderingContext.DrawString(runStart, pendingCount, aX, lastY, -1, spacing ? sp0 : nsnull); // Note: use aY not small-y so that decorations are drawn with @@ -1274,7 +1274,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, //if selection is > content length then selection has "slid off" // When there is no selection showing, use the fastest and // simplest rendering approach - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); } @@ -1302,7 +1302,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, selectionOffset = ip[selectionOffset] - mContentOffset; selectionEnd = ip[selectionEnd] - mContentOffset; if (selectionOffset == selectionEnd){ - aRenderingContext.DrawString(text, textLength, dx, dy, width); + aRenderingContext.DrawString(text, PRUint32(textLength), dx, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, dx, dy, width); // aRenderingContext.GetWidth(text, PRUint32(si.mStartOffset), textWidth); @@ -1319,8 +1319,8 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, // Render first (unselected) section aRenderingContext.GetWidth(text, PRUint32(selectionOffset),//si.mStartOffset), textWidth); - aRenderingContext.DrawString(text, selectionOffset, - x, dy, textWidth); + aRenderingContext.DrawString(text, PRUint32(selectionOffset), + x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); x += textWidth; @@ -1336,7 +1336,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, aRenderingContext.FillRect(x, dy, textWidth, mRect.height); aRenderingContext.SetColor(aTextStyle.mSelectionTextColor); aRenderingContext.DrawString(text + selectionOffset, - secondLen, x, dy, textWidth); + PRUint32(secondLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); aRenderingContext.SetColor(aTextStyle.mColor->mColor); @@ -1349,7 +1349,7 @@ TextFrame::PaintAsciiText(nsIPresContext& aPresContext, aRenderingContext.GetWidth(text + selectionEnd, PRUint32(thirdLen), textWidth); aRenderingContext.DrawString(text + selectionEnd, - thirdLen, x, dy, textWidth); + PRUint32(thirdLen), x, dy); PaintTextDecorations(aRenderingContext, aStyleContext, aTextStyle, x, dy, textWidth); } diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 14e385431d7..50a1f8472d0 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -559,7 +559,7 @@ nsComboboxControlFrame::PaintComboboxControl(nsIPresContext& aPresContext, aRenderingContext.SetColor(blkColor->mColor); - aRenderingContext.DrawString(mTextStr, x, y, 0); + aRenderingContext.DrawString(mTextStr, x, y); nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this, aDirtyRect, inside, *blkSpacing, blkStyle, 0); diff --git a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp index 51d07828c17..2e9cb2a095e 100644 --- a/mozilla/layout/html/forms/src/nsFormControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlFrame.cpp @@ -1169,7 +1169,7 @@ nsFormControlFrame::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); diff --git a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp index 1fa3d35e88a..77a52c2e2ec 100644 --- a/mozilla/layout/html/forms/src/nsFormControlHelper.cpp +++ b/mozilla/layout/html/forms/src/nsFormControlHelper.cpp @@ -780,7 +780,7 @@ nsFormControlHelper::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); @@ -1301,7 +1301,7 @@ nsFormControlHelper::PaintRectangularButton(nsIPresContext& aPresContext, y += onePixel; } - aRenderingContext.DrawString(aLabel, x, y, 0); + aRenderingContext.DrawString(aLabel, x, y); NS_RELEASE(context); PRBool clipEmpty; aRenderingContext.PopState(clipEmpty); diff --git a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp index 0759884da0d..fdc55a863db 100644 --- a/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsSelectControlFrame.cpp @@ -826,11 +826,11 @@ nsSelectControlFrame::PaintSelectControl(nsIPresContext& aPresContext, aRenderingContext.SetColor(NS_RGB(0,0,0)); aRenderingContext.FillRect(rect); aRenderingContext.SetColor(NS_RGB(255,255,255)); - aRenderingContext.DrawString(text, x, y, 0); + aRenderingContext.DrawString(text, x, y); aRenderingContext.SetColor(currentColor); } else { if (!mIsComboBox || (mIsComboBox && -1 == selectedIndex && 0 == i)) { - aRenderingContext.DrawString(text, x, y, 0); + aRenderingContext.DrawString(text, x, y); } } diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index 9812916497a..870c943feef 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -639,7 +639,7 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, text.Append("*"); } } - aRenderingContext.DrawString(text, x, y, 0); + aRenderingContext.DrawString(text, x, y); } else { float sbWidth; float sbHeight; @@ -664,11 +664,11 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext, nsString substr; if (-1 == pos) { text.Right(substr, text.Length()-oldPos); - aRenderingContext.DrawString(substr, x, y, 0); + aRenderingContext.DrawString(substr, x, y); break; } text.Left(substr, pos); - aRenderingContext.DrawString(substr, x, y, 0); + aRenderingContext.DrawString(substr, x, y); y += textHeight; pos++; oldPos = pos;