Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 9c822d8aad22 (bug 1371564) for build bustage: unused variable outputStart at nsTextFrameUtils.cpp:212. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-06-24 11:28:34 +02:00
parent 1596393322
commit 001bb41985
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsTextFrameUtils.cpp
View File

@ -189,6 +189,9 @@ TransformWhiteSpaces(const CharT* aText, uint32_t aLength,
aSkipChars->KeepChar();
aInWhitespace = IsSpaceOrTab(ch);
} else if (keepTransformedWhiteSpace) {
if (ch != ' ') {
aFlags |= nsTextFrameUtils::Flags::TEXT_WAS_TRANSFORMED;
}
*aOutput++ = ' ';
aSkipChars->KeepChar();
aInWhitespace = true;
@ -230,6 +233,7 @@ nsTextFrameUtils::TransformText(const CharT* aText, uint32_t aLength,
} else if (aCompression == COMPRESS_NONE_TRANSFORM_TO_SPACE) {
if (ch == '\t' || ch == '\n') {
ch = ' ';
flags |= Flags::TEXT_WAS_TRANSFORMED;
}
} else {
// aCompression == COMPRESS_NONE
@ -328,6 +332,9 @@ nsTextFrameUtils::TransformText(const CharT* aText, uint32_t aLength,
}
}
if (outputStart + aLength != aOutput) {
flags |= Flags::TEXT_WAS_TRANSFORMED;
}
*aAnalysisFlags = flags;
#ifdef DEBUG

3
layout/generic/nsTextFrameUtils.h
View File

@ -29,7 +29,8 @@ public:
TEXT_HAS_TAB = 0x01,
// the original text has at least one soft hyphen character
TEXT_HAS_SHY = 0x02,
TEXT_UNUSED_FLAGS = 0x0C,
TEXT_WAS_TRANSFORMED = 0x04,
TEXT_UNUSED_FLAG = 0x08,
// The following flags are set by nsTextFrame