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

Bug 1745113 Part 3 - Change CountGraphemeClusters() to take a Span parameter. r=jfkthame

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D135641
This commit is contained in:
Ting-Yu Lin
2022-01-13 18:36:04 +00:00
parent 2790167c28
commit 18989890b3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intl/unicharutil/util/nsUnicodeProperties.cpp
View File

@@ -167,8 +167,9 @@ bool IsClusterExtender(uint32_t aCh, uint8_t aCategory) {
(aCh >= 0xe0020 && aCh <= 0xe007f)); // emoji (flag) tag characters (aCh >= 0xe0020 && aCh <= 0xe007f)); // emoji (flag) tag characters
} }
uint32_t CountGraphemeClusters(const char16_t* aText, uint32_t aLength) { uint32_t CountGraphemeClusters(Span<const char16_t> aText) {
intl::GraphemeClusterBreakIteratorUtf16 iter(aText, aLength); intl::GraphemeClusterBreakIteratorUtf16 iter(aText.Elements(),
aText.Length());
uint32_t result = 0; uint32_t result = 0;
while (!iter.AtEnd()) { while (!iter.AtEnd()) {
++result; ++result;

3
intl/unicharutil/util/nsUnicodeProperties.h
View File

@@ -9,6 +9,7 @@
#include "mozilla/intl/UnicodeProperties.h" #include "mozilla/intl/UnicodeProperties.h"
#include "mozilla/Span.h"
#include "nsBidiUtils.h" #include "nsBidiUtils.h"
#include "nsUGenCategory.h" #include "nsUGenCategory.h"
#include "harfbuzz/hb.h" #include "harfbuzz/hb.h"
@@ -159,7 +160,7 @@ inline bool IsClusterExtender(uint32_t aCh) {
} }
// Count the number of grapheme clusters in the given string // Count the number of grapheme clusters in the given string
uint32_t CountGraphemeClusters(const char16_t* aText, uint32_t aLength); uint32_t CountGraphemeClusters(Span<const char16_t> aText);
// Determine whether a character is a "combining diacritic" for the purpose // Determine whether a character is a "combining diacritic" for the purpose
// of diacritic-insensitive text search. Examples of such characters include // of diacritic-insensitive text search. Examples of such characters include

2
layout/generic/nsTextFrame.cpp
View File

@@ -10481,7 +10481,7 @@ uint32_t nsTextFrame::CountGraphemeClusters() const {
nsAutoString content; nsAutoString content;
frag->AppendTo(content, AssertedCast<uint32_t>(GetContentOffset()), frag->AppendTo(content, AssertedCast<uint32_t>(GetContentOffset()),
AssertedCast<uint32_t>(GetContentLength())); AssertedCast<uint32_t>(GetContentLength()));
return unicode::CountGraphemeClusters(content.Data(), content.Length()); return unicode::CountGraphemeClusters(content);
} }
bool nsTextFrame::HasNonSuppressedText() const { bool nsTextFrame::HasNonSuppressedText() const {

6
layout/style/CounterStyleManager.cpp
View File

@@ -1681,10 +1681,8 @@ void CounterStyle::GetCounterText(CounterValue aOrdinal,
GetPad(pad); GetPad(pad);
int32_t diff = int32_t diff =
pad.width - pad.width -
narrow_cast<int32_t>( narrow_cast<int32_t>(unicode::CountGraphemeClusters(initialText) +
unicode::CountGraphemeClusters(initialText.Data(), unicode::CountGraphemeClusters(aResult));
initialText.Length()) +
unicode::CountGraphemeClusters(aResult.Data(), aResult.Length()));
if (diff > 0) { if (diff > 0) {
auto length = pad.symbol.Length(); auto length = pad.symbol.Length();
if (diff > LENGTH_LIMIT || length > LENGTH_LIMIT || if (diff > LENGTH_LIMIT || length > LENGTH_LIMIT ||