diff options
author | John Abd-El-Malek <jam@chromium.org> | 2014-12-12 16:42:18 -0800 |
---|---|---|
committer | John Abd-El-Malek <jam@chromium.org> | 2014-12-12 16:42:18 -0800 |
commit | 217ecf3b39f8d5c01260684848a8886c8ed2bf89 (patch) | |
tree | 1ab05e729480f2d8fab6882285c2e169c8ba007e /fpdfsdk/src | |
parent | 239955073722582152d9ab190794317dd775a1c1 (diff) | |
download | pdfium-217ecf3b39f8d5c01260684848a8886c8ed2bf89.tar.xz |
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
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/801913002
Diffstat (limited to 'fpdfsdk/src')
-rw-r--r-- | fpdfsdk/src/fpdfeditpage.cpp | 7 | ||||
-rw-r--r-- | fpdfsdk/src/fpdfoom.cpp | 27 | ||||
-rw-r--r-- | fpdfsdk/src/fpdfppo.cpp | 7 | ||||
-rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 65 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 7 | ||||
-rw-r--r-- | fpdfsdk/src/javascript/app.cpp | 20 | ||||
-rw-r--r-- | fpdfsdk/src/jsapi/fxjs_v8.cpp | 3 | ||||
-rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 6 |
8 files changed, 4 insertions, 138 deletions
diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index 5c43d4d4b2..831a85a750 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,7 +4,6 @@ // 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" @@ -44,11 +43,7 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument() { 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")); } return pDoc; diff --git a/fpdfsdk/src/fpdfoom.cpp b/fpdfsdk/src/fpdfoom.cpp deleted file mode 100644 index 2b202ba2eb..0000000000 --- a/fpdfsdk/src/fpdfoom.cpp +++ /dev/null @@ -1,27 +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 - -#include "../include/fsdk_define.h" -#include "../include/fpdfoom.h" - -void OOM_Handler(void* param) -{ - if (!param) return; - ((OOM_INFO*)param)->FSDK_OOM_Handler((OOM_INFO*)param); -} - - -DLLEXPORT FX_BOOL STDCALL FSDK_SetOOMHandler(OOM_INFO* oomInfo) -{ -#ifndef _FXSDK_OPENSOURCE_ - if (!oomInfo || oomInfo->version!=1) - return FALSE; - FXMEM_SetOOMHandler(FXMEM_GetDefaultMgr(),OOM_Handler,oomInfo); - return TRUE; -#else - return TRUE; -#endif -} diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index a5c4275648..c68ae68ebf 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -49,12 +49,7 @@ FX_BOOL CPDF_PageOrganizer::PDFDocInit(CPDF_Document *pDestPDFDoc, CPDF_Document return FALSE; CFX_ByteString producerstr; - -#ifdef FOXIT_CHROME_BUILD - producerstr.Format("Google"); -#else - producerstr.Format("Foxit PDF SDK %s - Foxit Corporation", "2.0"); -#endif + producerstr.Format("PDFium"); DInfoDict->SetAt("Producer", new CPDF_String(producerstr)); //Set type//////////////////////////////////////////////////////////////// diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index bd49862e1c..d8ec8c676a 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -106,40 +106,8 @@ public: CFontMapper* g_pFontMapper = NULL; #endif // #if _FX_OS_ == _FX_LINUX_EMBEDDED_ -DLLEXPORT void STDCALL FPDF_InitLibrary(FX_LPVOID hInstance) +DLLEXPORT void STDCALL FPDF_InitLibrary() { -#ifdef API5 - CPDF_ModuleMgr::Create(); - g_pModuleMgr = CPDF_ModuleMgr::Get(); - #if _FX_OS_ == _FX_WIN32_MOBILE_ || _FX_OS_ == _FX_LINUX_EMBEDDED_ - g_pModuleMgr->InitEmbedded(); - #ifdef _GB1_CMAPS_ - g_pModuleMgr->LoadEmbeddedGB1CMaps(); - #endif - #ifdef _GB1_CMAPS_4_ - g_pModuleMgr->LoadEmbeddedGB1CMaps_4(); - #endif - #ifdef _CNS1_CMAPS_ - g_pModuleMgr->LoadEmbeddedCNS1CMaps(); - #endif - #ifdef _JAPAN1_CMAPS_ - g_pModuleMgr->LoadEmbeddedJapan1CMaps(); - #endif - #ifdef _JAPAN1_CMAPS_6_ - g_pModuleMgr->LoadEmbeddedJapan1CMaps_6(); - #endif - #ifdef _KOREA1_CMAPS_ - g_pModuleMgr->LoadEmbeddedKorea1CMaps(); - #endif - #ifdef _JPX_DECODER_ - g_pModuleMgr->InitJpxModule(); - g_pModuleMgr->InitJbig2Module(); - // g_pModuleMgr->InitIccModule(); - #endif - #else - g_pModuleMgr->InitDesktop(); - #endif -#else g_pCodecModule = CCodec_ModuleMgr::Create(); CFX_GEModule::Create(); @@ -149,7 +117,6 @@ DLLEXPORT void STDCALL FPDF_InitLibrary(FX_LPVOID hInstance) CPDF_ModuleMgr::Get()->SetCodecModule(g_pCodecModule); CPDF_ModuleMgr::Get()->InitPageModule(); CPDF_ModuleMgr::Get()->InitRenderModule(); -#ifdef FOXIT_CHROME_BUILD CPDF_ModuleMgr * pModuleMgr = CPDF_ModuleMgr::Get(); if ( pModuleMgr ) { @@ -158,30 +125,6 @@ DLLEXPORT void STDCALL FPDF_InitLibrary(FX_LPVOID hInstance) pModuleMgr->LoadEmbeddedCNS1CMaps(); pModuleMgr->LoadEmbeddedKorea1CMaps(); } -#endif -#endif - -#ifdef _WIN32 - // Get module path - TCHAR app_path[MAX_PATH]; - ::GetModuleFileName((HINSTANCE)hInstance, app_path, MAX_PATH); - size_t len = _tcslen(app_path); - for (size_t i = len; i >= 0; i --) - if (app_path[i] == '\\') { - app_path[i] = 0; - break; - } - -#ifdef _UNICODE - #ifndef _FXSDK_OPENSOURCE_ - CPDF_ModuleMgr::Get()->SetModulePath(NULL, CFX_ByteString::FromUnicode(app_path)); - #endif -#else -#ifndef _FXSDK_OPENSOURCE_ - CPDF_ModuleMgr::Get()->SetModulePath(NULL, app_path); -#endif -#endif -#endif } @@ -198,11 +141,6 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary() CFX_GEModule::Destroy(); g_pCodecModule->Destroy(); #endif -#ifndef _FXSDK_OPENSOURCE_ - FXMEM_CollectAll(FXMEM_GetDefaultMgr()); -#else - -#endif } #ifndef _WIN32 @@ -733,7 +671,6 @@ DLLEXPORT void STDCALL FPDFBitmap_Destroy(FPDF_BITMAP bitmap) void FPDF_RenderPage_Retail(CRenderContext* pContext, FPDF_PAGE page, int start_x, int start_y, int size_x, int size_y, int rotate, int flags,FX_BOOL bNeedToRestore, IFSDK_PAUSE_Adapter * pause ) { -//#ifdef _LICENSED_BUILD_ CPDF_Page* pPage = (CPDF_Page*)page; if (pPage == NULL) return; diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index c10f937f5d..96cec474c2 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/app.cpp b/fpdfsdk/src/javascript/app.cpp index ebd68958b2..cac129de46 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -480,23 +480,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) @@ -1030,11 +1014,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; diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index 7d1226e234..1f47864e96 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -309,9 +309,6 @@ void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Persistent<v8::Context>& v8P void JS_Initial() { -#ifndef FOXIT_CHROME_BUILD - v8::V8::InitializeICU(); -#endif } void JS_Release() { diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index b5f50022f1..10549d583e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -312,11 +312,7 @@ FX_INT32 CPWL_FontMap::GetPWLFontIndex(FX_WORD word, FX_INT32 nCharset) } */ -#ifdef FOXIT_CHROME_BUILD - CFX_ByteString sAlias = EncodeFontAlias("Arial_Chrome", nCharset); -#else - CFX_ByteString sAlias = EncodeFontAlias("Arial_Foxit", nCharset); -#endif + CFX_ByteString sAlias = EncodeFontAlias("Arial_Chrome", nCharset); AddedFont(pNewFont, sAlias); return AddFontData(pNewFont, sAlias, nCharset); |