XFA: merge patch from issue 801913002 and 804463003

fpdfsdk/src/fpdfeditpage.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 "x:/pdf/fpdfapi5/include/fpdfapi.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfedit.h"
 #include "../include/fpdfformfill.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_app.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
 
 
 #if _FX_OS_ == _FX_ANDROID_
 #include "time.h"
@@ skipping 23 matching lines @@
                         }
                 }
         }
         
         CPDF_Dictionary* pInfoDict = NULL;
         pInfoDict = pDoc->GetInfo();
         if (pInfoDict)
         {
                 if(FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
                         pInfoDict->SetAt("CreationDate", new CPDF_String(DateStr));
-#ifdef FOXIT_CHROME_BUILD
-                pInfoDict->SetAt("Creator",FX_NEW CPDF_String(L"Google"));
-#else
-                pInfoDict->SetAt("Creator",FX_NEW CPDF_String(L"Foxit PDF SDK DLL 2.0 - Foxit Software"));
-#endif
+                pInfoDict->SetAt("Creator",FX_NEW CPDF_String(L"PDFium"));
         }
 
         CPDFXFA_App* pApp = FPDFXFA_GetApp();
         CPDFXFA_Document* document = FX_NEW CPDFXFA_Document(pDoc, pApp);
 
         return document;
 }
 
 DLLEXPORT void STDCALL FPDFPage_Delete(FPDF_DOCUMENT document, int page_index)
 {
@@ skipping 271 matching lines @@
         if (!pPage || !pPage->m_pFormDict || !pPage->m_pFormDict->KeyExist("Type") || !pPage->m_pFormDict->GetElement("Type")->GetDirect()
                 || pPage->m_pFormDict->GetElement("Type")->GetDirect()->GetString().Compare("Page"))
         {
                 return;
         }
         CPDF_Dictionary* pDict = pPage->m_pFormDict;
         rotate %=4;
 
         pDict->SetAt("Rotate", FX_NEW CPDF_Number(rotate * 90));
 }