Tidy up CPDF_DocEnvironment::JS_* methods

fpdfsdk/src/fsdk_mgr.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <memory>
 
 #include "fpdfsdk/include/fsdk_mgr.h"
 
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "public/fpdf_ext.h"
 #include "third_party/base/stl_util.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
 #else
 #include <ctime>
 #endif
 
+namespace {
+
+int CharSet2CP(int charset) {
+  if (charset == 128)
+    return 932;
+  if (charset == 134)
+    return 936;
+  if (charset == 129)
+    return 949;
+  if (charset == 136)
+    return 950;
+  return 0;
+}
+
+}  // namespace
+
+FPDF_WIDESTRING AsFPDFWideString(CFX_ByteString* bsUTF16LE) {
+  return reinterpret_cast<FPDF_WIDESTRING>(
+      bsUTF16LE->GetBuffer(bsUTF16LE->GetLength()));
+}
+
 class CFX_SystemHandler : public IFX_SystemHandler {
  public:
   explicit CFX_SystemHandler(CPDFDoc_Environment* pEnv)
       : m_pEnv(pEnv), m_nCharSet(-1) {}
   ~CFX_SystemHandler() override {}
 
  public:
   // IFX_SystemHandler
   void InvalidateRect(FX_HWND hWnd, FX_RECT rect) override;
   void OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect) override;
@@ skipping 121 matching lines @@
   }
 
   for (int i = 0; i < nSize; ++i) {
     if (pFontMapper->m_InstalledTTFonts[i].Compare(sFontFaceName))
       return TRUE;
   }
 
   return FALSE;
 }
 
-static int CharSet2CP(int charset) {
-  if (charset == 128)
-    return 932;
-  if (charset == 134)
-    return 936;
-  if (charset == 129)
-    return 949;
-  if (charset == 136)
-    return 950;
-  return 0;
-}
 CPDF_Font* CFX_SystemHandler::AddNativeTrueTypeFontToPDF(
     CPDF_Document* pDoc,
     CFX_ByteString sFontFaceName,
     uint8_t nCharset) {
   if (pDoc) {
     CFX_Font* pFXFont = new CFX_Font();
     pFXFont->LoadSubst(sFontFaceName, TRUE, 0, 0, 0, CharSet2CP(nCharset),
                        FALSE);
     CPDF_Font* pFont = pDoc->AddFont(pFXFont, nCharset, FALSE);
     delete pFXFont;
@@ skipping 21 matching lines @@
   m_pSysHandler.reset(new CFX_SystemHandler(this));
 }
 
 CPDFDoc_Environment::~CPDFDoc_Environment() {
 }
 
 int CPDFDoc_Environment::JS_appAlert(const FX_WCHAR* Msg,
                                      const FX_WCHAR* Title,
                                      FX_UINT Type,
                                      FX_UINT Icon) {
-  if (m_pInfo && m_pInfo->m_pJsPlatform && m_pInfo->m_pJsPlatform->app_alert) {
-    CFX_ByteString bsMsg = CFX_WideString(Msg).UTF16LE_Encode();
-    CFX_ByteString bsTitle = CFX_WideString(Title).UTF16LE_Encode();
-    FPDF_WIDESTRING pMsg = (FPDF_WIDESTRING)bsMsg.GetBuffer(bsMsg.GetLength());
-    FPDF_WIDESTRING pTitle =
-        (FPDF_WIDESTRING)bsTitle.GetBuffer(bsTitle.GetLength());
-    int ret = m_pInfo->m_pJsPlatform->app_alert(m_pInfo->m_pJsPlatform, pMsg,
-                                                pTitle, Type, Icon);
-    bsMsg.ReleaseBuffer();
-    bsTitle.ReleaseBuffer();
-    return ret;
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
+      !m_pInfo->m_pJsPlatform->app_alert) {
+    return -1;
   }
-  return -1;
+  CFX_ByteString bsMsg = CFX_WideString(Msg).UTF16LE_Encode();
+  CFX_ByteString bsTitle = CFX_WideString(Title).UTF16LE_Encode();
+  return m_pInfo->m_pJsPlatform->app_alert(
+      m_pInfo->m_pJsPlatform, AsFPDFWideString(&bsMsg),
+      AsFPDFWideString(&bsTitle), Type, Icon);
 }
 
 int CPDFDoc_Environment::JS_appResponse(const FX_WCHAR* Question,
                                         const FX_WCHAR* Title,
                                         const FX_WCHAR* Default,
                                         const FX_WCHAR* cLabel,
                                         FPDF_BOOL bPassword,
                                         void* response,
                                         int length) {
-  if (m_pInfo && m_pInfo->m_pJsPlatform &&
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
       m_pInfo->m_pJsPlatform->app_response) {

[Lei Zhang, 2016/02/01 23:22:09]

Missing '!'

[Tom Sepez, 2016/02/01 23:38:13]

yikes.

-    CFX_ByteString bsQuestion = CFX_WideString(Question).UTF16LE_Encode();
-    CFX_ByteString bsTitle = CFX_WideString(Title).UTF16LE_Encode();
-    CFX_ByteString bsDefault = CFX_WideString(Default).UTF16LE_Encode();
-    CFX_ByteString bsLabel = CFX_WideString(cLabel).UTF16LE_Encode();
-    FPDF_WIDESTRING pQuestion =
-        (FPDF_WIDESTRING)bsQuestion.GetBuffer(bsQuestion.GetLength());
-    FPDF_WIDESTRING pTitle =
-        (FPDF_WIDESTRING)bsTitle.GetBuffer(bsTitle.GetLength());
-    FPDF_WIDESTRING pDefault =
-        (FPDF_WIDESTRING)bsDefault.GetBuffer(bsDefault.GetLength());
-    FPDF_WIDESTRING pLabel =
-        (FPDF_WIDESTRING)bsLabel.GetBuffer(bsLabel.GetLength());
-    int ret = m_pInfo->m_pJsPlatform->app_response(
-        m_pInfo->m_pJsPlatform, pQuestion, pTitle, pDefault, pLabel, bPassword,
-        response, length);
-    bsQuestion.ReleaseBuffer();
-    bsTitle.ReleaseBuffer();
-    bsDefault.ReleaseBuffer();
-    bsLabel.ReleaseBuffer();
-    return ret;
+    return -1;
   }
-  return -1;
+  CFX_ByteString bsQuestion = CFX_WideString(Question).UTF16LE_Encode();
+  CFX_ByteString bsTitle = CFX_WideString(Title).UTF16LE_Encode();
+  CFX_ByteString bsDefault = CFX_WideString(Default).UTF16LE_Encode();
+  CFX_ByteString bsLabel = CFX_WideString(cLabel).UTF16LE_Encode();
+  return m_pInfo->m_pJsPlatform->app_response(
+      m_pInfo->m_pJsPlatform, AsFPDFWideString(&bsQuestion),
+      AsFPDFWideString(&bsTitle), AsFPDFWideString(&bsDefault),
+      AsFPDFWideString(&bsLabel), bPassword, response, length);
+}
+
+void CPDFDoc_Environment::JS_appBeep(int nType) {
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform || m_pInfo->m_pJsPlatform->app_beep) {

[Lei Zhang, 2016/02/01 23:22:09]

Missing '!'

[Tom Sepez, 2016/02/01 23:38:13]

Done.

+    return;
+  }
+  m_pInfo->m_pJsPlatform->app_beep(m_pInfo->m_pJsPlatform, nType);
 }
 
 CFX_WideString CPDFDoc_Environment::JS_fieldBrowse() {
   if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
       !m_pInfo->m_pJsPlatform->Field_browse) {
-    return L"";
+    return CFX_WideString();
   }
-
   const int nRequiredLen =
       m_pInfo->m_pJsPlatform->Field_browse(m_pInfo->m_pJsPlatform, nullptr, 0);
   if (nRequiredLen <= 0)
-    return L"";
+    return CFX_WideString();
 
   std::unique_ptr<char[]> pBuff(new char[nRequiredLen]);
   memset(pBuff.get(), 0, nRequiredLen);
   const int nActualLen = m_pInfo->m_pJsPlatform->Field_browse(
       m_pInfo->m_pJsPlatform, pBuff.get(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)
-    return L"";
+    return CFX_WideString();
 
-  CFX_ByteString bsRet = CFX_ByteString(pBuff.get(), nActualLen);
-  CFX_WideString wsRet = CFX_WideString::FromLocal(bsRet);
-  return wsRet;
+  return CFX_WideString::FromLocal(CFX_ByteString(pBuff.get(), nActualLen));
 }
 
 CFX_WideString CPDFDoc_Environment::JS_docGetFilePath() {
   if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
       !m_pInfo->m_pJsPlatform->Doc_getFilePath) {
-    return L"";
+    return CFX_WideString();
   }
-
   const int nRequiredLen = m_pInfo->m_pJsPlatform->Doc_getFilePath(
       m_pInfo->m_pJsPlatform, nullptr, 0);
   if (nRequiredLen <= 0)
-    return L"";
+    return CFX_WideString();
 
   std::unique_ptr<char[]> pBuff(new char[nRequiredLen]);
   memset(pBuff.get(), 0, nRequiredLen);
   const int nActualLen = m_pInfo->m_pJsPlatform->Doc_getFilePath(
       m_pInfo->m_pJsPlatform, pBuff.get(), nRequiredLen);
   if (nActualLen <= 0 || nActualLen > nRequiredLen)
-    return L"";
+    return CFX_WideString();
 
-  CFX_ByteString bsRet = CFX_ByteString(pBuff.get(), nActualLen);
-  CFX_WideString wsRet = CFX_WideString::FromLocal(bsRet);
-  return wsRet;
+  return CFX_WideString::FromLocal(CFX_ByteString(pBuff.get(), nActualLen));
 }
 
 void CPDFDoc_Environment::JS_docSubmitForm(void* formData,
                                            int length,
                                            const FX_WCHAR* URL) {
-  if (m_pInfo && m_pInfo->m_pJsPlatform &&
-      m_pInfo->m_pJsPlatform->Doc_submitForm) {
-    CFX_ByteString bsDestination = CFX_WideString(URL).UTF16LE_Encode();
-    FPDF_WIDESTRING pDestination =
-        (FPDF_WIDESTRING)bsDestination.GetBuffer(bsDestination.GetLength());
-    m_pInfo->m_pJsPlatform->Doc_submitForm(m_pInfo->m_pJsPlatform, formData,
-                                           length, pDestination);
-    bsDestination.ReleaseBuffer();
+  if (!m_pInfo || m_pInfo->m_pJsPlatform ||

[Lei Zhang, 2016/02/01 23:22:09]

missing '!'

[Tom Sepez, 2016/02/01 23:38:13]

Done.

+      !m_pInfo->m_pJsPlatform->Doc_submitForm) {
+    return;
   }
+  CFX_ByteString bsDestination = CFX_WideString(URL).UTF16LE_Encode();
+  m_pInfo->m_pJsPlatform->Doc_submitForm(m_pInfo->m_pJsPlatform, formData,
+                                         length,
+                                         AsFPDFWideString(&bsDestination));
 }
 
 void CPDFDoc_Environment::JS_docmailForm(void* mailData,
                                          int length,
                                          FPDF_BOOL bUI,
                                          const FX_WCHAR* To,
                                          const FX_WCHAR* Subject,
                                          const FX_WCHAR* CC,
                                          const FX_WCHAR* BCC,
                                          const FX_WCHAR* Msg) {
-  if (m_pInfo && m_pInfo->m_pJsPlatform && m_pInfo->m_pJsPlatform->Doc_mail) {
-    CFX_ByteString bsTo = CFX_WideString(To).UTF16LE_Encode();
-    CFX_ByteString bsSubject = CFX_WideString(Subject).UTF16LE_Encode();
-    CFX_ByteString bsCC = CFX_WideString(CC).UTF16LE_Encode();
-    CFX_ByteString bsBcc = CFX_WideString(BCC).UTF16LE_Encode();
-    CFX_ByteString bsMsg = CFX_WideString(Msg).UTF16LE_Encode();
-    FPDF_WIDESTRING pTo = (FPDF_WIDESTRING)bsTo.GetBuffer(bsTo.GetLength());
-    FPDF_WIDESTRING pCC = (FPDF_WIDESTRING)bsCC.GetBuffer(bsCC.GetLength());
-    FPDF_WIDESTRING pBcc = (FPDF_WIDESTRING)bsBcc.GetBuffer(bsBcc.GetLength());
-    FPDF_WIDESTRING pSubject =
-        (FPDF_WIDESTRING)bsSubject.GetBuffer(bsSubject.GetLength());
-    FPDF_WIDESTRING pMsg = (FPDF_WIDESTRING)bsMsg.GetBuffer(bsMsg.GetLength());
-    m_pInfo->m_pJsPlatform->Doc_mail(m_pInfo->m_pJsPlatform, mailData, length,
-                                     bUI, pTo, pSubject, pCC, pBcc, pMsg);
-    bsTo.ReleaseBuffer();
-    bsCC.ReleaseBuffer();
-    bsBcc.ReleaseBuffer();
-    bsSubject.ReleaseBuffer();
-    bsMsg.ReleaseBuffer();
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
+      !m_pInfo->m_pJsPlatform->Doc_mail) {
+    return;
   }
+  CFX_ByteString bsTo = CFX_WideString(To).UTF16LE_Encode();
+  CFX_ByteString bsSubject = CFX_WideString(Subject).UTF16LE_Encode();
+  CFX_ByteString bsCC = CFX_WideString(CC).UTF16LE_Encode();
+  CFX_ByteString bsBcc = CFX_WideString(BCC).UTF16LE_Encode();
+  CFX_ByteString bsMsg = CFX_WideString(Msg).UTF16LE_Encode();
+  m_pInfo->m_pJsPlatform->Doc_mail(
+      m_pInfo->m_pJsPlatform, mailData, length, bUI, AsFPDFWideString(&bsTo),
+      AsFPDFWideString(&bsSubject), AsFPDFWideString(&bsCC),
+      AsFPDFWideString(&bsBcc), AsFPDFWideString(&bsMsg));
+}
+
+void CPDFDoc_Environment::JS_docprint(FPDF_BOOL bUI,
+                                      int nStart,
+                                      int nEnd,
+                                      FPDF_BOOL bSilent,
+                                      FPDF_BOOL bShrinkToFit,
+                                      FPDF_BOOL bPrintAsImage,
+                                      FPDF_BOOL bReverse,
+                                      FPDF_BOOL bAnnotations) {
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
+      !m_pInfo->m_pJsPlatform->Doc_print) {
+    return;
+  }
+  m_pInfo->m_pJsPlatform->Doc_print(m_pInfo->m_pJsPlatform, bUI, nStart, nEnd,
+                                    bSilent, bShrinkToFit, bPrintAsImage,
+                                    bReverse, bAnnotations);
+}
+
+void CPDFDoc_Environment::JS_docgotoPage(int nPageNum) {
+  if (!m_pInfo || !m_pInfo->m_pJsPlatform ||
+      !m_pInfo->m_pJsPlatform->Doc_gotoPage) {
+    return;
+  }
+  m_pInfo->m_pJsPlatform->Doc_gotoPage(m_pInfo->m_pJsPlatform, nPageNum);
 }
 
 IJS_Runtime* CPDFDoc_Environment::GetJSRuntime() {
   if (!IsJSInitiated())
     return NULL;
   if (!m_pJSRuntime)
     m_pJSRuntime.reset(IJS_Runtime::Create(this));
   return m_pJSRuntime.get();
 }
 
@@ skipping 561 matching lines @@
   CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot();
   if (!pFocusAnnot)
     return nullptr;
 
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
     if (pAnnot == pFocusAnnot)
       return pAnnot;
   }
   return nullptr;
 }