Split Classify() helper in fx_bidi.cpp.
Get rid of some true/false usage at call site.
Change-Id: I55c330db1c1d7107f541ece66e467e891bdfc301
Reviewed-on: https://pdfium-review.googlesource.com/c/48173
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp
index 0cb8207..9fee05d 100644
--- a/core/fxcrt/fx_bidi.cpp
+++ b/core/fxcrt/fx_bidi.cpp
@@ -301,15 +301,14 @@
(*chars)[i - 1].m_iBidiLevel = static_cast<int16_t>(iValue);
}
-void Classify(std::vector<CFX_Char>* chars, size_t iCount, bool bWS) {
- if (bWS) {
- for (size_t i = 0; i < iCount; ++i) {
- CFX_Char& cur = (*chars)[i];
- cur.m_iBidiClass = FX_GetBidiClass(cur.char_code());
- }
- return;
+void Classify(std::vector<CFX_Char>* chars, size_t iCount) {
+ for (size_t i = 0; i < iCount; ++i) {
+ CFX_Char& cur = (*chars)[i];
+ cur.m_iBidiClass = FX_GetBidiClass(cur.char_code());
}
+}
+void ClassifyWithTransform(std::vector<CFX_Char>* chars, size_t iCount) {
for (size_t i = 0; i < iCount; ++i) {
CFX_Char& cur = (*chars)[i];
cur.m_iBidiClass =
@@ -541,12 +540,12 @@
if (iCount < 2)
return;
- Classify(chars, iCount, false);
+ ClassifyWithTransform(chars, iCount);
ResolveExplicit(chars, iCount);
ResolveWeak(chars, iCount);
ResolveNeutrals(chars, iCount);
ResolveImplicit(chars, iCount);
- Classify(chars, iCount, true);
+ Classify(chars, iCount);
ResolveWhitespace(chars, iCount);
Reorder(chars, iCount);
Position(chars, iCount);
