wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out fix for bug 404624 because I think it's causing a mochitest to assert

Browse Source
This commit is contained in:
roc+@cs.cmu.edu 2007-12-02 18:20:22 -08:00
parent 34e1841267
commit b2e3b8803a
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/generic/nsTextFrameThebes.cpp
View File

@ -1941,8 +1941,6 @@ static PRBool IsInBounds(const gfxSkipCharsIterator& aStart, PRInt32 aContentLen
PRUint32 aOffset, PRUint32 aLength) { PRUint32 aOffset, PRUint32 aLength) {
if (aStart.GetSkippedOffset() > aOffset) if (aStart.GetSkippedOffset() > aOffset)
return PR_FALSE; return PR_FALSE;
if (aContentLength == PR_INT32_MAX)
return PR_TRUE;
gfxSkipCharsIterator iter(aStart); gfxSkipCharsIterator iter(aStart);
iter.AdvanceOriginal(aContentLength); iter.AdvanceOriginal(aContentLength);
return iter.GetSkippedOffset() >= aOffset + aLength; return iter.GetSkippedOffset() >= aOffset + aLength;
@ -1954,11 +1952,6 @@ public:
/** /**
* Use this constructor for reflow, when we don't know what text is * Use this constructor for reflow, when we don't know what text is
* really mapped by the frame and we have a lot of other data around. * really mapped by the frame and we have a lot of other data around.
*
* @param aLength can be PR_INT32_MAX to indicate we cover all the text
* associated with aFrame up to where its flow chain ends in the given
* textrun. If PR_INT32_MAX is passed, justification and hyphen-related methods
* cannot be called, nor can GetOriginalLength().
*/ */
PropertyProvider(gfxTextRun* aTextRun, const nsStyleText* aTextStyle, PropertyProvider(gfxTextRun* aTextRun, const nsStyleText* aTextStyle,
const nsTextFragment* aFrag, nsTextFrame* aFrame, const nsTextFragment* aFrag, nsTextFrame* aFrame,
@ -2032,10 +2025,7 @@ public:
// (for the static provider) // (for the static provider)
const gfxSkipCharsIterator& GetStart() { return mStart; } const gfxSkipCharsIterator& GetStart() { return mStart; }
// May return PR_INT32_MAX if that was given to the constructor // May return PR_INT32_MAX if that was given to the constructor
PRUint32 GetOriginalLength() { PRUint32 GetOriginalLength() { return mLength; }
NS_ASSERTION(mLength != PR_INT32_MAX, "Length not known");
return mLength;
}
const nsTextFragment* GetFragment() { return mFrag; } const nsTextFragment* GetFragment() { return mFrag; }
gfxFontGroup* GetFontGroup() { gfxFontGroup* GetFontGroup() {
@ -2061,7 +2051,7 @@ protected:
gfxSkipCharsIterator mStart; // Offset in original and transformed string gfxSkipCharsIterator mStart; // Offset in original and transformed string
gfxSkipCharsIterator mTempIterator; gfxSkipCharsIterator mTempIterator;
nsTArray<gfxFloat>* mTabWidths; // widths for each transformed string character nsTArray<gfxFloat>* mTabWidths; // widths for each transformed string character
PRInt32 mLength; // DOM string length, may be PR_INT32_MAX PRInt32 mLength; // DOM string length
gfxFloat mWordSpacing; // space for each whitespace char gfxFloat mWordSpacing; // space for each whitespace char
gfxFloat mLetterSpacing; // space for each letter gfxFloat mLetterSpacing; // space for each letter
gfxFloat mJustificationSpacing; gfxFloat mJustificationSpacing;
@ -2332,7 +2322,6 @@ PropertyProvider::GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
PRPackedBool* aBreakBefore) PRPackedBool* aBreakBefore)
{ {
NS_PRECONDITION(IsInBounds(mStart, mLength, aStart, aLength), "Range out of bounds"); NS_PRECONDITION(IsInBounds(mStart, mLength, aStart, aLength), "Range out of bounds");
NS_PRECONDITION(mLength != PR_INT32_MAX, "Can't call this with undefined length");
if (!mTextStyle->WhiteSpaceCanWrap()) { if (!mTextStyle->WhiteSpaceCanWrap()) {
memset(aBreakBefore, PR_FALSE, aLength); memset(aBreakBefore, PR_FALSE, aLength);
@ -2392,9 +2381,7 @@ void
PropertyProvider::FindJustificationRange(gfxSkipCharsIterator* aStart, PropertyProvider::FindJustificationRange(gfxSkipCharsIterator* aStart,
gfxSkipCharsIterator* aEnd) gfxSkipCharsIterator* aEnd)
{ {
NS_PRECONDITION(mLength != PR_INT32_MAX, "Can't call this with undefined length");
NS_ASSERTION(aStart && aEnd, "aStart or/and aEnd is null"); NS_ASSERTION(aStart && aEnd, "aStart or/and aEnd is null");
aStart->SetOriginalOffset(mStart.GetOriginalOffset()); aStart->SetOriginalOffset(mStart.GetOriginalOffset());
aEnd->SetOriginalOffset(mStart.GetOriginalOffset() + mLength); aEnd->SetOriginalOffset(mStart.GetOriginalOffset() + mLength);
@ -2422,8 +2409,6 @@ PropertyProvider::FindJustificationRange(gfxSkipCharsIterator* aStart,
void void
PropertyProvider::SetupJustificationSpacing() PropertyProvider::SetupJustificationSpacing()
{ {
NS_PRECONDITION(mLength != PR_INT32_MAX, "Can't call this with undefined length");
if (NS_STYLE_TEXT_ALIGN_JUSTIFY != mTextStyle->mTextAlign || if (NS_STYLE_TEXT_ALIGN_JUSTIFY != mTextStyle->mTextAlign ||
mTextStyle->WhiteSpaceIsSignificant()) mTextStyle->WhiteSpaceIsSignificant())
return; return;
@ -4858,7 +4843,7 @@ nsTextFrame::AddInlineMinWidthForFlow(nsIRenderingContext *aRenderingContext,
// OK since we can't really handle tabs for intrinsic sizing anyway. // OK since we can't really handle tabs for intrinsic sizing anyway.
const nsTextFragment* frag = mContent->GetText(); const nsTextFragment* frag = mContent->GetText();
PropertyProvider provider(mTextRun, GetStyleText(), frag, this, PropertyProvider provider(mTextRun, GetStyleText(), frag, this,
iter, PR_INT32_MAX, nsnull, 0); iter, GetInFlowContentLength(), nsnull, 0);
PRBool collapseWhitespace = !provider.GetStyleText()->WhiteSpaceIsSignificant(); PRBool collapseWhitespace = !provider.GetStyleText()->WhiteSpaceIsSignificant();
PRUint32 start = PRUint32 start =
@ -4958,7 +4943,7 @@ nsTextFrame::AddInlinePrefWidthForFlow(nsIRenderingContext *aRenderingContext,
// Pass null for the line container. This will disable tab spacing, but that's // Pass null for the line container. This will disable tab spacing, but that's
// OK since we can't really handle tabs for intrinsic sizing anyway. // OK since we can't really handle tabs for intrinsic sizing anyway.
PropertyProvider provider(mTextRun, GetStyleText(), mContent->GetText(), this, PropertyProvider provider(mTextRun, GetStyleText(), mContent->GetText(), this,
iter, PR_INT32_MAX, nsnull, 0); iter, GetInFlowContentLength(), nsnull, 0);
PRBool collapseWhitespace = !provider.GetStyleText()->WhiteSpaceIsSignificant(); PRBool collapseWhitespace = !provider.GetStyleText()->WhiteSpaceIsSignificant();
PRUint32 start = PRUint32 start =