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, 29 insertions, 123 deletions

diff --git a/fpdfsdk/include/fpdfoom.h b/fpdfsdk/include/fpdfoom.h
deleted file mode 100644
index dd14b74b4f..0000000000
--- a/fpdfsdk/include/fpdfoom.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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
-
-#ifndef _FPDFOOM_H_
-#define _FPDFOOM_H_
-
-#ifndef _FPDFVIEW_H_
-#include "fpdfview.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef	struct _OOM_INFO
-{
-	/**
-	* Version number of the interface. Currently must be 1.
-	**/
-	int version;
-	
-	/** 
-	* Method: FSDK_OOM_Handler
-	*			 Out-Of-Memory handling function.
-	* Interface Version:
-	*			1
-	* Implementation Required:
-	*			Yes
-	* Parameters:
-	*		pThis		-	Pointer to the interface structure itself.
-	* 	Return value:
-	* 		None.
-	* */
-
-	void(*FSDK_OOM_Handler)(_OOM_INFO* pThis);
-}OOM_INFO;
-
-
-/**
- * Function: FSDK_SetOOMHandler
- *			 Setup A Out-Of-Memory handler for foxit sdk. 
- * Parameters:
- *			oomInfo		-	Pointer to a OOM_INFO structure.
- * Return Value:
- *			TRUE means successful. FALSE means fails. 
- **/
-
-DLLEXPORT FPDF_BOOL STDCALL FSDK_SetOOMHandler(OOM_INFO* oomInfo);
-
-
-#ifdef __cplusplus
-};
-#endif
-
-
-
-
-#endif
diff --git a/fpdfsdk/include/fpdfview.h b/fpdfsdk/include/fpdfview.h
index 04a3af928d..34c3f522a4 100644
--- a/fpdfsdk/include/fpdfview.h
+++ b/fpdfsdk/include/fpdfview.h
@@ -155,13 +155,13 @@ extern "C" {
 // Function: FPDF_InitLibrary
 //			Initialize the FPDFSDK library 
 // Parameters:
-//			hInstance	-	For WIN32 system only: the instance of the executable or DLL module.
+//			None
 // Return value:
 //			None.
 // Comments:
 //			You have to call this function before you can call any PDF processing functions.
 
-DLLEXPORT void STDCALL FPDF_InitLibrary(void* hInstance);
+DLLEXPORT void STDCALL FPDF_InitLibrary();
 
 
 // Function: FPDF_DestroyLibary
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index b95d63eab4..3509e8e2ab 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -12,66 +12,33 @@
 #include <math.h>
 #endif
 
-//#define API5
-#define API6
-#define  _FPDFAPI_ASYNC_PARSING_
-#define _FXSDK_OPENSOURCE_
-
-#ifdef _FPDFEMB_WCE_
-	#include "../../core/include/fpdfapi/fpdfapi.h" 
-	#include "../../core/include/fpdfapi/fpdf_parser.h" 
-	#include "../../core/include/fpdfapi/fpdf_module.h" 
-	#include "../../core/include/fpdfapi/fpdf_render.h" 
-	#include "../../core/include/fpdfapi/fpdf_pageobj.h" 
-	#include "../../core/include/fpdfapi/fpdf_serial.h" 
-
-	#include "../../core/include/fpdftext/fpdf_text.h"
-
-	#include "../../core/include/fxge/fx_ge_win32.h"
-	#include "../../core/include/fxge/fx_ge.h"
-
-	#include "../../core/include/fxcodec/fx_codec.h"
-
-	#include "../../core/include/fpdfdoc/fpdf_doc.h" 
-	#include "../../core/include/fpdfdoc/fpdf_vt.h" 
-
-	#include "../../core/include/fxcrt/fx_xml.h" 
-	#include "../../core/include/fxcrt/fx_crypt.h"
-
-#else
-	#ifdef API6
-		#include "../../core/include/fpdfapi/fpdf_parser.h" 
-		#include "../../core/include/fpdfapi/fpdfapi.h" 
-		#include "../../core/include/fpdfapi/fpdf_parser.h" 
-		#include "../../core/include/fpdfapi/fpdf_module.h" 
-		#include "../../core/include/fpdfapi/fpdf_render.h" 
-		#include "../../core/include/fpdfapi/fpdf_pageobj.h" 
-		#include "../../core/include/fpdfapi/fpdf_serial.h" 
-
-		#include "../../core/include/fpdftext/fpdf_text.h"
-
-		#include "../../core/include/fxge/fx_ge_win32.h"
-		#include "../../core/include/fxge/fx_ge.h"
-
-		#include "../../core/include/fxcodec/fx_codec.h"
-
-		#include "../../core/include/fpdfdoc/fpdf_doc.h" 
-		#include "../../core/include/fpdfdoc/fpdf_vt.h" 
-
-		#include "../../core/include/fxcrt/fx_xml.h" 
-		#include "../../xfa/include/fxbarcode/BC_BarCode.h"
-		#include "../../xfa/include/fxjse/fxjse.h"
-		#include "../../xfa/include/fxgraphics/fx_graphics.h"
-		#include "../../xfa/include/fxfa/fxfa.h"
-
-		#include "../../xfa/include/fwl/core/fwl_error.h"
-		#include "../../xfa/include/fwl/core/fwl_timer.h"
-		#include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
-		#ifdef _LICENSED_BUILD_
-			#include "../../cryptopp/Cryptlib.h"
-		#endif
-	#endif
-#endif
+#include "../../core/include/fpdfapi/fpdf_parser.h" 
+#include "../../core/include/fpdfapi/fpdfapi.h" 
+#include "../../core/include/fpdfapi/fpdf_parser.h" 
+#include "../../core/include/fpdfapi/fpdf_module.h" 
+#include "../../core/include/fpdfapi/fpdf_render.h" 
+#include "../../core/include/fpdfapi/fpdf_pageobj.h" 
+#include "../../core/include/fpdfapi/fpdf_serial.h" 
+
+#include "../../core/include/fpdftext/fpdf_text.h"
+
+#include "../../core/include/fxge/fx_ge_win32.h"
+#include "../../core/include/fxge/fx_ge.h"
+
+#include "../../core/include/fxcodec/fx_codec.h"
+
+#include "../../core/include/fpdfdoc/fpdf_doc.h" 
+#include "../../core/include/fpdfdoc/fpdf_vt.h" 
+
+#include "../../core/include/fxcrt/fx_xml.h" 
+#include "../../xfa/include/fxbarcode/BC_BarCode.h"
+#include "../../xfa/include/fxjse/fxjse.h"
+#include "../../xfa/include/fxgraphics/fx_graphics.h"
+#include "../../xfa/include/fxfa/fxfa.h"
+
+#include "../../xfa/include/fwl/core/fwl_error.h"
+#include "../../xfa/include/fwl/core/fwl_timer.h"
+#include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 
 
 #ifndef FX_GetAValue