wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 17:47:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

[DOM] Convert cleanup of FlushCurrentWord() to a ScopeExit task.

Browse source 
Ensures consistent cleanup even if early exit due to OOM.
This commit is contained in:
Moonchild 2025-01-08 14:39:22 +01:00 • committed by roytam1
commit 5ea8de0262
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dom/base/nsLineBreaker.cpp
View file

@ -10,6 +10,7 @@
#include "nsHyphenationManager.h" #include "nsHyphenationManager.h"
#include "nsHyphenator.h" #include "nsHyphenator.h"
#include "mozilla/gfx/2D.h" #include "mozilla/gfx/2D.h"
#include "mozilla/ScopeExit.h"
nsLineBreaker::nsLineBreaker() nsLineBreaker::nsLineBreaker()
: mCurrentWordLanguage(nullptr), : mCurrentWordLanguage(nullptr),
@ -57,6 +58,14 @@ SetupCapitalization(const char16_t* aWord, uint32_t aLength,
nsresult nsresult
nsLineBreaker::FlushCurrentWord() nsLineBreaker::FlushCurrentWord()
{ {
auto cleanup = mozilla::MakeScopeExit([&] {
mCurrentWord.Clear();
mTextItems.Clear();
mCurrentWordContainsComplexChar = false;
mCurrentWordContainsMixedLang = false;
mCurrentWordLanguage = nullptr;
});
uint32_t length = mCurrentWord.Length(); uint32_t length = mCurrentWord.Length();
AutoTArray<uint8_t,4000> breakState; AutoTArray<uint8_t,4000> breakState;
if (!breakState.AppendElements(length)) if (!breakState.AppendElements(length))
@ -137,11 +146,6 @@ nsLineBreaker::FlushCurrentWord()
offset += ti->mLength; offset += ti->mLength;
} }
mCurrentWord.Clear();
mTextItems.Clear();
mCurrentWordContainsComplexChar = false;
mCurrentWordContainsMixedLang = false;
mCurrentWordLanguage = nullptr;
return NS_OK; return NS_OK;
} }