commit 11506300e6a64de2aaba2abbea23d69b98627412
author Henrique Nakashima <hnakashima@chromium.org> Wed Dec 06 22:09:40 2017 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Dec 06 22:09:40 2017 +0000
tree b6822f6629ef9ecca1de1b71f82a94abacf95950
parent fd9e0b8f5f9204a46090c3b392b9a4322a6ea09d

Fix ps rendering.

Also fix other occurrences that were missed.

Bug:pdfium:947
Change-Id: Ic7e909ff9ce3abdf91e8e9ba108c84ad28b2fd65
Reviewed-on: https://pdfium-review.googlesource.com/20472
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>

core/fxge/win32/cfx_psrenderer.cpp

diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp
index ecfab49..1513c07 100644
--- a/core/fxge/win32/cfx_psrenderer.cpp
+++ b/core/fxge/win32/cfx_psrenderer.cpp
@@ -676,8 +676,7 @@
       last_fontnum = ps_fontnum;
     }
     buf << pCharPos[i].m_Origin.x << " " << pCharPos[i].m_Origin.y << " m";
-    ByteString hex;
-    hex.Format("<%02X>", ps_glyphindex);
+    ByteString hex = ByteString::Format("<%02X>", ps_glyphindex);
     buf << hex.AsStringView() << "Tj\n";
   }
   buf << "Q\n";

fxjs/cjs_global.cpp

diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp
index db63a4b..95124ff 100644
--- a/fxjs/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -116,8 +116,8 @@
       pObj->DelProperty(pRuntime, PropFromV8Prop(property).c_str());
   if (result.HasError()) {
     // TODO(dsinclair): Should this set the pRuntime->Error result?
-    // ByteString cbName;
-    // cbName.Format("%s.%s", class_name, "DelProperty");
+    // ByteString cbName =
+    //     ByteString::Format("%s.%s", class_name, "DelProperty");
   }
 }
 

xfa/fgas/font/cfgas_fontmgr.cpp

diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 1e829e5..2647eb5 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -952,8 +952,7 @@
     uint16_t wCodePage,
     uint32_t dwFontStyles,
     const wchar_t* pszFontFamily) {
-  ByteString bsHash;
-  bsHash.Format("%d, %d", wCodePage, dwFontStyles);
+  ByteString bsHash = ByteString::Format("%d, %d", wCodePage, dwFontStyles);
   bsHash += FX_UTF8Encode(WideStringView(pszFontFamily));
   uint32_t dwHash = FX_HashCode_GetA(bsHash.AsStringView(), false);
   std::vector<RetainPtr<CFGAS_GEFont>>* pFontArray = &m_Hash2Fonts[dwHash];
@@ -1012,9 +1011,10 @@
   uint16_t wBitField = x ? x->wBitField : 0x03E7;
   ByteString bsHash;
   if (wCodePage == 0xFFFF)
-    bsHash.Format("%d, %d, %d", wCodePage, wBitField, dwFontStyles);
+    bsHash =
+        ByteString::Format("%d, %d, %d", wCodePage, wBitField, dwFontStyles);
   else
-    bsHash.Format("%d, %d", wCodePage, dwFontStyles);
+    bsHash = ByteString::Format("%d, %d", wCodePage, dwFontStyles);
   bsHash += FX_UTF8Encode(WideStringView(pszFontFamily));
   uint32_t dwHash = FX_HashCode_GetA(bsHash.AsStringView(), false);
   std::vector<RetainPtr<CFGAS_GEFont>>* pFonts = &m_Hash2Fonts[dwHash];
@@ -1091,8 +1091,7 @@
                                                 uint32_t dwFontStyles,
                                                 uint16_t wCodePage) {
 #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-  ByteString bsHash;
-  bsHash.Format("%d, %d", wCodePage, dwFontStyles);
+  ByteString bsHash = ByteString::Format("%d, %d", wCodePage, dwFontStyles);
   bsHash += FX_UTF8Encode(WideStringView(pszFontFamily));
   uint32_t dwHash = FX_HashCode_GetA(bsHash.AsStringView(), false);
   std::vector<RetainPtr<CFGAS_GEFont>>* pFontArray = &m_Hash2Fonts[dwHash];