Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the unused context parameter to MeasureCharClippedText. (Bug 627842, patch 10) r=roc

Browse Source
This commit is contained in:
L. David Baron 2011-11-23 18:48:23 -08:00
parent 93a3cc8415
commit af0ddba78e
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/TextOverflow.cpp
View File

@ -105,11 +105,8 @@ IsFullyClipped(nsTextFrame* aFrame, nscoord aLeft, nscoord aRight,
if (aLeft <= 0 && aRight <= 0) {
return false;
}
nsRefPtr<nsRenderingContext> rc =
aFrame->PresContext()->PresShell()->GetReferenceRenderingContext();
return rc &&
!aFrame->MeasureCharClippedText(rc->ThebesContext(), aLeft, aRight,
aSnappedLeft, aSnappedRight);
return !aFrame->MeasureCharClippedText(aLeft, aRight,
aSnappedLeft, aSnappedRight);
}
static bool

6
layout/generic/nsTextFrame.h
View File

@ -289,8 +289,7 @@ public:
* the method returns false.
* @return true if at least one whole grapheme cluster fit between the edges
*/
bool MeasureCharClippedText(gfxContext* aCtx,
nscoord aLeftEdge, nscoord aRightEdge,
bool MeasureCharClippedText(nscoord aLeftEdge, nscoord aRightEdge,
nscoord* aSnappedLeftEdge,
nscoord* aSnappedRightEdge);
/**
@ -299,8 +298,7 @@ public:
* undefined when the method returns false.
* @return true if at least one whole grapheme cluster fit between the edges
*/
bool MeasureCharClippedText(gfxContext* aCtx,
PropertyProvider& aProvider,
bool MeasureCharClippedText(PropertyProvider& aProvider,
nscoord aLeftEdge, nscoord aRightEdge,
PRUint32* aStartOffset, PRUint32* aMaxLength,
nscoord* aSnappedLeftEdge,

14
layout/generic/nsTextFrameThebes.cpp
View File

@ -5272,13 +5272,12 @@ ComputeTransformedLength(PropertyProvider& aProvider)
}
bool
nsTextFrame::MeasureCharClippedText(gfxContext* aCtx,
nscoord aLeftEdge, nscoord aRightEdge,
nsTextFrame::MeasureCharClippedText(nscoord aLeftEdge, nscoord aRightEdge,
nscoord* aSnappedLeftEdge,
nscoord* aSnappedRightEdge)
{
// Don't pass in aRenderingContext here, because we need a *reference*
// context and aRenderingContext might have some transform in it
// We need a *reference* rendering context (not one that might have a
// transform), so we don't have a rendering context argument.
// XXX get the block and line passed to us somehow! This is slow!
gfxSkipCharsIterator iter = EnsureTextRun(nsTextFrame::eInflated);
if (!mTextRun)
@ -5290,7 +5289,7 @@ nsTextFrame::MeasureCharClippedText(gfxContext* aCtx,
PRUint32 startOffset = provider.GetStart().GetSkippedOffset();
PRUint32 maxLength = ComputeTransformedLength(provider);
return MeasureCharClippedText(aCtx, provider, aLeftEdge, aRightEdge,
return MeasureCharClippedText(provider, aLeftEdge, aRightEdge,
&startOffset, &maxLength,
aSnappedLeftEdge, aSnappedRightEdge);
}
@ -5314,8 +5313,7 @@ static PRUint32 GetClusterLength(gfxTextRun* aTextRun,
}
bool
nsTextFrame::MeasureCharClippedText(gfxContext* aCtx,
PropertyProvider& aProvider,
nsTextFrame::MeasureCharClippedText(PropertyProvider& aProvider,
nscoord aLeftEdge, nscoord aRightEdge,
PRUint32* aStartOffset,
PRUint32* aMaxLength,
@ -5401,7 +5399,7 @@ nsTextFrame::PaintText(nsRenderingContext* aRenderingContext, nsPoint aPt,
PRUint32 startOffset = provider.GetStart().GetSkippedOffset();
PRUint32 maxLength = ComputeTransformedLength(provider);
nscoord snappedLeftEdge, snappedRightEdge;
if (!MeasureCharClippedText(ctx, provider, aItem.mLeftEdge, aItem.mRightEdge,
if (!MeasureCharClippedText(provider, aItem.mLeftEdge, aItem.mRightEdge,
&startOffset, &maxLength, &snappedLeftEdge, &snappedRightEdge)) {
return;
}