corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1090626 - Rename result of IsChineseOrJapanese from isCJK to isCJ, to avoid misleading, since it does not include Korean. r=jdaggett

Browse Source 
Note that the name inside of IsJustifiableCharacter is already correct.
This commit is contained in:
L. David Baron
2014-10-30 11:27:45 -07:00
parent b1fd550d62
commit 05f59b6f25
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/generic/nsTextFrame.cpp
View File

@@ -2956,11 +2956,11 @@ PropertyProvider::ComputeJustifiableCharacters(int32_t aOffset, int32_t aLength)
run(mStart, nsSkipCharsRunIterator::LENGTH_INCLUDES_SKIPPED, aLength); run(mStart, nsSkipCharsRunIterator::LENGTH_INCLUDES_SKIPPED, aLength);
run.SetOriginalOffset(aOffset); run.SetOriginalOffset(aOffset);
uint32_t justifiableChars = 0; uint32_t justifiableChars = 0;
bool isCJK = IsChineseOrJapanese(mFrame); bool isCJ = IsChineseOrJapanese(mFrame);
while (run.NextRun()) { while (run.NextRun()) {
for (int32_t i = 0; i < run.GetRunLength(); ++i) { for (int32_t i = 0; i < run.GetRunLength(); ++i) {
justifiableChars += justifiableChars +=
IsJustifiableCharacter(mFrag, run.GetOriginalOffset() + i, isCJK); IsJustifiableCharacter(mFrag, run.GetOriginalOffset() + i, isCJ);
} }
} }
return justifiableChars; return justifiableChars;
@@ -3083,7 +3083,7 @@ PropertyProvider::GetSpacingInternal(uint32_t aStart, uint32_t aLength,
gfxFloat halfJustificationSpace = mJustificationSpacing/2; gfxFloat halfJustificationSpace = mJustificationSpacing/2;
// Scan non-skipped characters and adjust justifiable chars, adding // Scan non-skipped characters and adjust justifiable chars, adding
// justification space on either side of the cluster // justification space on either side of the cluster
bool isCJK = IsChineseOrJapanese(mFrame); bool isCJ = IsChineseOrJapanese(mFrame);
gfxSkipCharsIterator justificationStart(mStart), justificationEnd(mStart); gfxSkipCharsIterator justificationStart(mStart), justificationEnd(mStart);
FindJustificationRange(&justificationStart, &justificationEnd); FindJustificationRange(&justificationStart, &justificationEnd);
@@ -3094,7 +3094,7 @@ PropertyProvider::GetSpacingInternal(uint32_t aStart, uint32_t aLength,
int32_t runOriginalOffset = run.GetOriginalOffset(); int32_t runOriginalOffset = run.GetOriginalOffset();
for (int32_t i = 0; i < run.GetRunLength(); ++i) { for (int32_t i = 0; i < run.GetRunLength(); ++i) {
int32_t iterOriginalOffset = runOriginalOffset + i; int32_t iterOriginalOffset = runOriginalOffset + i;
if (IsJustifiableCharacter(mFrag, iterOriginalOffset, isCJK)) { if (IsJustifiableCharacter(mFrag, iterOriginalOffset, isCJ)) {
iter.SetOriginalOffset(iterOriginalOffset); iter.SetOriginalOffset(iterOriginalOffset);
FindClusterStart(mTextRun, runOriginalOffset, &iter); FindClusterStart(mTextRun, runOriginalOffset, &iter);
uint32_t clusterFirstChar = iter.GetSkippedOffset(); uint32_t clusterFirstChar = iter.GetSkippedOffset();
@@ -8478,13 +8478,13 @@ nsTextFrame::TrimTrailingWhiteSpace(nsRenderingContext* aRC)
// Check if any character in the last cluster is justifiable // Check if any character in the last cluster is justifiable
PropertyProvider provider(mTextRun, textStyle, frag, this, start, contentLength, PropertyProvider provider(mTextRun, textStyle, frag, this, start, contentLength,
nullptr, 0, nsTextFrame::eInflated); nullptr, 0, nsTextFrame::eInflated);
bool isCJK = IsChineseOrJapanese(this); bool isCJ = IsChineseOrJapanese(this);
gfxSkipCharsIterator justificationStart(start), justificationEnd(trimmedEndIter); gfxSkipCharsIterator justificationStart(start), justificationEnd(trimmedEndIter);
provider.FindJustificationRange(&justificationStart, &justificationEnd); provider.FindJustificationRange(&justificationStart, &justificationEnd);
for (int32_t i = justificationEnd.GetOriginalOffset(); for (int32_t i = justificationEnd.GetOriginalOffset();
i < trimmed.GetEnd(); ++i) { i < trimmed.GetEnd(); ++i) {
if (IsJustifiableCharacter(frag, i, isCJK)) { if (IsJustifiableCharacter(frag, i, isCJ)) {
result.mLastCharIsJustifiable = true; result.mLastCharIsJustifiable = true;
} }
} }