From ff242e0b62173718a6e98aee1306ac48f6372572 Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Thu, 14 Apr 2016 14:54:57 -0700
Subject: Avoid needless construction of CFX_ByteStrings during string building

There are perfectly fine operators for adding to an existing string
without first duplicating the arguments.

Review URL: https://codereview.chromium.org/1891953002
---
 core/fpdfdoc/doc_utils.cpp                         | 32 +++++++++++-----------
 .../BC_PDF417DetectionResultRowIndicatorColumn.cpp |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/fpdfdoc/doc_utils.cpp b/core/fpdfdoc/doc_utils.cpp
index ccb244d87c..408f0065e2 100644
--- a/core/fpdfdoc/doc_utils.cpp
+++ b/core/fpdfdoc/doc_utils.cpp
@@ -91,11 +91,11 @@ CFX_ByteString CPDF_DefaultAppearance::GetFontString() {
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
   if (syntax.FindTagParamFromStart("Tf", 2)) {
-    csFont += (CFX_ByteString)syntax.GetWord();
+    csFont += syntax.GetWord();
     csFont += " ";
-    csFont += (CFX_ByteString)syntax.GetWord();
+    csFont += syntax.GetWord();
     csFont += " ";
-    csFont += (CFX_ByteString)syntax.GetWord();
+    csFont += syntax.GetWord();
   }
   return csFont;
 }
@@ -135,31 +135,31 @@ CFX_ByteString CPDF_DefaultAppearance::GetColorString(
   }
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
   if (syntax.FindTagParamFromStart(bStrokingOperation ? "G" : "g", 1)) {
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     return csColor;
   }
   if (syntax.FindTagParamFromStart(bStrokingOperation ? "RG" : "rg", 3)) {
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     return csColor;
   }
   if (syntax.FindTagParamFromStart(bStrokingOperation ? "K" : "k", 4)) {
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
     csColor += " ";
-    csColor += (CFX_ByteString)syntax.GetWord();
+    csColor += syntax.GetWord();
   }
   return csColor;
 }
@@ -245,10 +245,10 @@ CFX_ByteString CPDF_DefaultAppearance::GetTextMatrixString() {
   CPDF_SimpleParser syntax(m_csDA.AsStringC());
   if (syntax.FindTagParamFromStart("Tm", 6)) {
     for (int i = 0; i < 6; i++) {
-      csTM += (CFX_ByteString)syntax.GetWord();
+      csTM += syntax.GetWord();
       csTM += " ";
     }
-    csTM += (CFX_ByteString)syntax.GetWord();
+    csTM += syntax.GetWord();
   }
   return csTM;
 }
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index bdcd91052c..3a6d73fd40 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -222,7 +222,7 @@ FX_BOOL CBC_DetectionResultRowIndicatorColumn::isLeft() {
   return m_isLeft;
 }
 CFX_ByteString CBC_DetectionResultRowIndicatorColumn::toString() {
-  return (CFX_ByteString) "IsLeft: " + (CFX_ByteString)m_isLeft + '\n' +
+  return CFX_ByteString("IsLeft: ") + m_isLeft + '\n' +
          CBC_DetectionResultColumn::toString();
 }
 void CBC_DetectionResultRowIndicatorColumn::removeIncorrectCodewords(
-- 
cgit v1.2.3