commit a6e49481f2197dca00b8c650f2764c31612a5543
author Tom Sepez <tsepez@chromium.org> Thu Mar 14 23:27:12 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 14 23:27:12 2019 +0000
tree eaa9d3bb4eced0f7c0aaf83161d325f0e8acb89c
parent d5d068e40811090f7b2275fecd8bc80fa8340c16

Remove stringviews in cfgas_stringformatter.cpp, part2.

Missed a few in commit 9284a7cf9ba6f105de8c978191b0733e19625755

Change-Id: I7cb0d8d2efd85ac70d60cb6acee867789ae9e2c8
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/51931
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>

xfa/fgas/crt/cfgas_stringformatter.cpp

diff --git a/xfa/fgas/crt/cfgas_stringformatter.cpp b/xfa/fgas/crt/cfgas_stringformatter.cpp
index 3115df5..fff66e0 100644
--- a/xfa/fgas/crt/cfgas_stringformatter.cpp
+++ b/xfa/fgas/crt/cfgas_stringformatter.cpp
@@ -639,14 +639,13 @@
       bPM = true;
   }
 
-  WideStringView wsTimeSymbols(gs_wsTimeSymbols);
   while (ccf < spTimePattern.size()) {
     if (spTimePattern[ccf] == '\'') {
       wsResult += GetLiteralText(spTimePattern, &ccf);
       ccf++;
       continue;
     }
-    if (!wsTimeSymbols.Contains(spTimePattern[ccf])) {
+    if (!pdfium::ContainsValue(gs_wsTimeSymbols, spTimePattern[ccf])) {
       wsResult += spTimePattern[ccf++];
       continue;
     }
@@ -852,11 +851,11 @@
   FX_LOCALECATEGORY eCategory = FX_LOCALECATEGORY_Unknown;
   size_t ccf = 0;
   bool bBraceOpen = false;
-  WideStringView wsConstChars(gs_wsConstChars);
   while (ccf < m_spPattern.size()) {
     if (m_spPattern[ccf] == '\'') {
       GetLiteralText(m_spPattern, &ccf);
-    } else if (!bBraceOpen && !wsConstChars.Contains(m_spPattern[ccf])) {
+    } else if (!bBraceOpen &&
+               !pdfium::ContainsValue(gs_wsConstChars, m_spPattern[ccf])) {
       WideString wsCategory(m_spPattern[ccf]);
       ccf++;
       while (true) {
@@ -904,7 +903,6 @@
     WideStringView wsCategory) const {
   size_t ccf = 0;
   bool bBrackOpen = false;
-  WideStringView wsConstChars(gs_wsConstChars);
   WideString wsPurgePattern;
   while (ccf < m_spPattern.size()) {
     if (m_spPattern[ccf] == '\'') {
@@ -912,7 +910,8 @@
       GetLiteralText(m_spPattern, &ccf);
       wsPurgePattern +=
           WideStringView(m_spPattern.data() + iCurChar, ccf - iCurChar + 1);
-    } else if (!bBrackOpen && !wsConstChars.Contains(m_spPattern[ccf])) {
+    } else if (!bBrackOpen &&
+               !pdfium::ContainsValue(gs_wsConstChars, m_spPattern[ccf])) {
       WideString wsSearchCategory(m_spPattern[ccf]);
       ccf++;
       while (ccf < m_spPattern.size() && m_spPattern[ccf] != '{' &&
@@ -955,14 +954,14 @@
   size_t ccf = 0;
   bool bFindDot = false;
   bool bBrackOpen = false;
-  WideStringView wsConstChars(gs_wsConstChars);
   while (ccf < m_spPattern.size()) {
     if (m_spPattern[ccf] == '\'') {
       int32_t iCurChar = ccf;
       GetLiteralText(m_spPattern, &ccf);
       *wsPurgePattern +=
           WideStringView(m_spPattern.data() + iCurChar, ccf - iCurChar + 1);
-    } else if (!bBrackOpen && !wsConstChars.Contains(m_spPattern[ccf])) {
+    } else if (!bBrackOpen &&
+               !pdfium::ContainsValue(gs_wsConstChars, m_spPattern[ccf])) {
       WideString wsCategory(m_spPattern[ccf]);
       ccf++;
       while (ccf < m_spPattern.size() && m_spPattern[ccf] != '{' &&
@@ -1543,7 +1542,6 @@
   size_t ccf = 0;
   int32_t iFindCategory = 0;
   bool bBraceOpen = false;
-  WideStringView wsConstChars(gs_wsConstChars);
   while (ccf < m_spPattern.size()) {
     if (m_spPattern[ccf] == '\'') {
       int32_t iCurChar = ccf;
@@ -1551,7 +1549,7 @@
       wsTempPattern +=
           WideStringView(m_spPattern.data() + iCurChar, ccf - iCurChar + 1);
     } else if (!bBraceOpen && iFindCategory != 3 &&
-               !wsConstChars.Contains(m_spPattern[ccf])) {
+               !pdfium::ContainsValue(gs_wsConstChars, m_spPattern[ccf])) {
       WideString wsCategory(m_spPattern[ccf]);
       ccf++;
       while (ccf < m_spPattern.size() && m_spPattern[ccf] != '{' &&