Make CFX_ByteString(const CFX_ByteStringC&) explicit.

Add missing helper function to CFX_ByteTextBuf to avoid the
anti-pattern CFX_ByteString(sBuf.AsStringC()), using the name
"Make" to indicate there's an allocation going on in this case.

Change some method arguments to take pre-existing ByteStrings where
possible.

Review-Url: https://codereview.chromium.org/1977093002

1 files changed, 27 insertions, 22 deletions

diff --git a/core/fxcrt/fx_xml_parser.cpp b/core/fxcrt/fx_xml_parser.cpp
index a5e351fe56..6017bd8fda 100644
--- a/core/fxcrt/fx_xml_parser.cpp
+++ b/core/fxcrt/fx_xml_parser.cpp
@@ -397,8 +397,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent,
       }
       CFX_WideString attr_value;
       GetAttrValue(attr_value);
-      pElement->m_AttrMap.SetAt(attr_space.AsStringC(), attr_name.AsStringC(),
-                                attr_value.AsStringC());
+      pElement->m_AttrMap.SetAt(attr_space, attr_name, attr_value);
     }
     m_nOffset = m_nBufferOffset + (FX_FILESIZE)m_dwIndex;
     if (m_dwIndex < m_dwBufferSize || IsEOF()) {
@@ -597,14 +596,13 @@ CFX_ByteString CXML_Element::GetTagName(FX_BOOL bQualified) const {
   bsTag += m_TagName;
   return bsTag;
 }
+
 CFX_ByteString CXML_Element::GetNamespace(FX_BOOL bQualified) const {
-  if (bQualified) {
-    return m_QSpaceName;
-  }
-  return GetNamespaceURI(m_QSpaceName.AsStringC());
+  return bQualified ? m_QSpaceName : GetNamespaceURI(m_QSpaceName);
 }
+
 CFX_ByteString CXML_Element::GetNamespaceURI(
-    const CFX_ByteStringC& qName) const {
+    const CFX_ByteString& qName) const {
   const CFX_WideString* pwsSpace;
   const CXML_Element* pElement = this;
   do {
@@ -633,20 +631,23 @@ void CXML_Element::GetAttrByIndex(int index,
   value = item.m_Value;
 }
 FX_BOOL CXML_Element::HasAttr(const CFX_ByteStringC& name) const {
-  CFX_ByteStringC bsSpace, bsName;
+  CFX_ByteStringC bsSpace;
+  CFX_ByteStringC bsName;
   FX_XML_SplitQualifiedName(name, bsSpace, bsName);
-  return !!m_AttrMap.Lookup(bsSpace, bsName);
+  return !!m_AttrMap.Lookup(CFX_ByteString(bsSpace), CFX_ByteString(bsName));
 }
 FX_BOOL CXML_Element::GetAttrValue(const CFX_ByteStringC& name,
                                    CFX_WideString& attribute) const {
-  CFX_ByteStringC bsSpace, bsName;
+  CFX_ByteStringC bsSpace;
+  CFX_ByteStringC bsName;
   FX_XML_SplitQualifiedName(name, bsSpace, bsName);
   return GetAttrValue(bsSpace, bsName, attribute);
 }
 FX_BOOL CXML_Element::GetAttrValue(const CFX_ByteStringC& space,
                                    const CFX_ByteStringC& name,
                                    CFX_WideString& attribute) const {
-  const CFX_WideString* pValue = m_AttrMap.Lookup(space, name);
+  const CFX_WideString* pValue =
+      m_AttrMap.Lookup(CFX_ByteString(space), CFX_ByteString(name));
   if (pValue) {
     attribute = *pValue;
     return TRUE;
@@ -655,9 +656,11 @@ FX_BOOL CXML_Element::GetAttrValue(const CFX_ByteStringC& space,
 }
 FX_BOOL CXML_Element::GetAttrInteger(const CFX_ByteStringC& name,
                                      int& attribute) const {
-  CFX_ByteStringC bsSpace, bsName;
+  CFX_ByteStringC bsSpace;
+  CFX_ByteStringC bsName;
   FX_XML_SplitQualifiedName(name, bsSpace, bsName);
-  const CFX_WideString* pwsValue = m_AttrMap.Lookup(bsSpace, bsName);
+  const CFX_WideString* pwsValue =
+      m_AttrMap.Lookup(CFX_ByteString(bsSpace), CFX_ByteString(bsName));
   if (pwsValue) {
     attribute = pwsValue->GetInteger();
     return TRUE;
@@ -667,7 +670,8 @@ FX_BOOL CXML_Element::GetAttrInteger(const CFX_ByteStringC& name,
 FX_BOOL CXML_Element::GetAttrInteger(const CFX_ByteStringC& space,
                                      const CFX_ByteStringC& name,
                                      int& attribute) const {
-  const CFX_WideString* pwsValue = m_AttrMap.Lookup(space, name);
+  const CFX_WideString* pwsValue =
+      m_AttrMap.Lookup(CFX_ByteString(space), CFX_ByteString(name));
   if (pwsValue) {
     attribute = pwsValue->GetInteger();
     return TRUE;
@@ -683,7 +687,8 @@ FX_BOOL CXML_Element::GetAttrFloat(const CFX_ByteStringC& name,
 FX_BOOL CXML_Element::GetAttrFloat(const CFX_ByteStringC& space,
                                    const CFX_ByteStringC& name,
                                    FX_FLOAT& attribute) const {
-  const CFX_WideString* pValue = m_AttrMap.Lookup(space, name);
+  const CFX_WideString* pValue =
+      m_AttrMap.Lookup(CFX_ByteString(space), CFX_ByteString(name));
   if (pValue) {
     attribute = pValue->GetFloat();
     return TRUE;
@@ -754,13 +759,13 @@ uint32_t CXML_Element::FindElement(CXML_Element* pChild) const {
   return (uint32_t)-1;
 }
 
-bool CXML_AttrItem::Matches(const CFX_ByteStringC& space,
-                            const CFX_ByteStringC& name) const {
+bool CXML_AttrItem::Matches(const CFX_ByteString& space,
+                            const CFX_ByteString& name) const {
   return (space.IsEmpty() || m_QSpaceName == space) && m_AttrName == name;
 }
 
-const CFX_WideString* CXML_AttrMap::Lookup(const CFX_ByteStringC& space,
-                                           const CFX_ByteStringC& name) const {
+const CFX_WideString* CXML_AttrMap::Lookup(const CFX_ByteString& space,
+                                           const CFX_ByteString& name) const {
   if (!m_pMap)
     return nullptr;
 
@@ -771,9 +776,9 @@ const CFX_WideString* CXML_AttrMap::Lookup(const CFX_ByteStringC& space,
   return nullptr;
 }
 
-void CXML_AttrMap::SetAt(const CFX_ByteStringC& space,
-                         const CFX_ByteStringC& name,
-                         const CFX_WideStringC& value) {
+void CXML_AttrMap::SetAt(const CFX_ByteString& space,
+                         const CFX_ByteString& name,
+                         const CFX_WideString& value) {
   if (!m_pMap)
     m_pMap.reset(new std::vector<CXML_AttrItem>);