XFA: merge patch from issue 801913002 and 804463003

Simplify PDFium by removing code that's not used in the open source repo.

-remove parameter from FPDF_InitLibrary
-remove a bunch of ifdefs that are unused

Fix build after previous commit.

TBR=tsepez@chromium.org
BUG=

Review URL: https://codereview.chromium.org/809513002

3 files changed, 0 insertions, 31 deletions

diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index 3bbd3f0115..9ee9639813 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -1763,9 +1763,6 @@ FX_BOOL Document::removeIcon(OBJ_METHOD_PARAMS)
 	if(!m_pIconTree)
 		return FALSE;
 	CFX_WideString swIconName = params[0].operator CFX_WideString();
-#ifndef FOXIT_CHROME_BUILD
-	m_pIconTree->DeleteIconElement(swIconName);
-#endif
 	return TRUE;
 }
 
@@ -2155,11 +2152,7 @@ FX_BOOL Document::deletePages(OBJ_METHOD_PARAMS)
 
 	
 
-#ifndef FOXIT_CHROME_BUILD
-	return m_pDocument->DeletePages(nStart, nEnd - nStart + 1);
-#else
 	return TRUE;
-#endif
 }
 
 FX_BOOL Document::extractPages(OBJ_METHOD_PARAMS)
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 197d7b4e6f..cf06f9aba6 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -27,11 +27,7 @@
 #include "../../include/javascript/global.h"
 #include "../../include/javascript/console.h"
 #include "../../include/fpdfxfa/fpdfxfa_app.h"
-#ifndef FOXIT_CHROME_BUILD
-#include "../../../fxjse/value.h"
-#else
 #include "../../../xfa/src/fxjse/src/value.h"
-#endif
 
 #include <libplatform/libplatform.h>
 
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index 03043e3a4d..602bfaee93 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -493,23 +493,7 @@ FX_BOOL app::popUpMenuEx(OBJ_METHOD_PARAMS)
 
 FX_BOOL app::fs(OBJ_PROP_PARAMS)
 {
-#ifdef FOXIT_CHROME_BUILD
 	return FALSE;
-#else
-	CJS_Context* pContext = (CJS_Context*)cc;
-	ASSERT(pContext != NULL);
-	CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-	ASSERT(pRuntime != NULL);
-
-	if (vp.IsGetting())
-	{
-		return TRUE;
-	}
-	else
-	{
-		return TRUE;
-	}
-#endif
 }
 
 FX_BOOL app::setInterval(OBJ_METHOD_PARAMS)
@@ -1043,11 +1027,7 @@ FX_BOOL app::response(OBJ_METHOD_PARAMS)
 {
 	CFX_WideString swQuestion = L"";
 	CFX_WideString swLabel = L"";
-#ifndef FOXIT_CHROME_BUILD
-	CFX_WideString swTitle = L"Foxit";
-#else
 	CFX_WideString swTitle = L"PDF";
-#endif
 	CFX_WideString swDefault = L"";
 	bool bPassWord = false;