Remove experimental FPDF_SetTypefaceAccessibleFunc() API.
FPDF_SetTypefaceAccessibleFunc() is meant to be used with
FPDF_SetPrintTextWithGDI(). Since FPDF_SetPrintTextWithGDI() is gone,
delete this API as well.
Bug: chromium:1188795
Change-Id: I2822673c490cdb34a8ee7b790c105bb1a1c5ea5b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/87170
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 2b08c61..3276689 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -263,10 +263,6 @@
}
}
}
-
- if (pdf_use_win32_gdi) {
- defines += [ "PDFIUM_PRINT_TEXT_WITH_GDI" ]
- }
}
config("pdfium_core_config") {
diff --git a/build_overrides/pdfium.gni b/build_overrides/pdfium.gni
index ab89cd9..725b0b4 100644
--- a/build_overrides/pdfium.gni
+++ b/build_overrides/pdfium.gni
@@ -26,7 +26,3 @@
# support.
# Default: Use agg.
pdf_use_skia_paths_override = false
-
-# Build PDFium either with or without experimental win32 GDI APIs.
-# Default: Without experimental win32 GDI APIs.
-pdf_use_win32_gdi_override = false
diff --git a/core/fxge/cfx_windowsrenderdevice.h b/core/fxge/cfx_windowsrenderdevice.h
index a6d70d7..52cf79d 100644
--- a/core/fxge/cfx_windowsrenderdevice.h
+++ b/core/fxge/cfx_windowsrenderdevice.h
@@ -26,14 +26,6 @@
class CFX_PSFontTracker;
struct EncoderIface;
-#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
-typedef void (*PDFiumEnsureTypefaceCharactersAccessible)(const LOGFONT* font,
- const wchar_t* text,
- size_t text_length);
-
-extern PDFiumEnsureTypefaceCharactersAccessible
- g_pdfium_typeface_accessible_func;
-#endif
extern WindowsPrintMode g_pdfium_print_mode;
class CFX_WindowsRenderDevice : public CFX_RenderDevice {
diff --git a/core/fxge/win32/cgdi_printer_driver.cpp b/core/fxge/win32/cgdi_printer_driver.cpp
index df953f5..3e5dbf4 100644
--- a/core/fxge/win32/cgdi_printer_driver.cpp
+++ b/core/fxge/win32/cgdi_printer_driver.cpp
@@ -25,11 +25,6 @@
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
-PDFiumEnsureTypefaceCharactersAccessible g_pdfium_typeface_accessible_func =
- nullptr;
-#endif
-
CGdiPrinterDriver::CGdiPrinterDriver(HDC hDC)
: CGdiDeviceDriver(hDC, DeviceType::kPrinter),
m_HorzSize(::GetDeviceCaps(m_hDC, HORZSIZE)),
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index bd9e2a0..e253687 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -217,13 +217,6 @@
}
#if BUILDFLAG(IS_WIN)
-#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
-FPDF_EXPORT void FPDF_CALLCONV
-FPDF_SetTypefaceAccessibleFunc(PDFiumEnsureTypefaceCharactersAccessible func) {
- g_pdfium_typeface_accessible_func = func;
-}
-#endif // PDFIUM_PRINT_TEXT_WITH_GDI
-
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDF_SetPrintMode(int mode) {
if (mode < FPDF_PRINTMODE_EMF ||
mode > FPDF_PRINTMODE_POSTSCRIPT3_TYPE42_PASSTHROUGH) {
diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index 40e034f..d32e2d2 100644
--- a/fpdfsdk/fpdf_view_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -499,9 +499,6 @@
CHK(FPDF_SetPrintMode);
#endif
CHK(FPDF_SetSandBoxPolicy);
-#if defined(_WIN32) && defined(PDFIUM_PRINT_TEXT_WITH_GDI)
- CHK(FPDF_SetTypefaceAccessibleFunc);
-#endif
CHK(FPDF_VIEWERREF_GetDuplex);
CHK(FPDF_VIEWERREF_GetName);
CHK(FPDF_VIEWERREF_GetNumCopies);
diff --git a/pdfium.gni b/pdfium.gni
index 5851099..86b3b09 100644
--- a/pdfium.gni
+++ b/pdfium.gni
@@ -44,9 +44,6 @@
# paths.
pdf_use_skia_paths = pdf_use_skia_paths_override
- # Build PDFium with or without experimental win32 GDI APIs.
- pdf_use_win32_gdi = pdf_use_win32_gdi_override
-
# Build PDFium standalone
pdf_is_standalone = false
diff --git a/public/fpdfview.h b/public/fpdfview.h
index ba3d505..779fa5f 100644
--- a/public/fpdfview.h
+++ b/public/fpdfview.h
@@ -292,26 +292,6 @@
FPDF_BOOL enable);
#if defined(_WIN32)
-#if defined(PDFIUM_PRINT_TEXT_WITH_GDI)
-// Pointer to a helper function to make |font| with |text| of |text_length|
-// accessible when printing text with GDI. This is useful in sandboxed
-// environments where PDFium's access to GDI may be restricted.
-typedef void (*PDFiumEnsureTypefaceCharactersAccessible)(const LOGFONT* font,
- const wchar_t* text,
- size_t text_length);
-
-// Experimental API.
-// Function: FPDF_SetTypefaceAccessibleFunc
-// Set the function pointer that makes GDI fonts available in sandboxed
-// environments.
-// Parameters:
-// func - A function pointer. See description above.
-// Return value:
-// None.
-FPDF_EXPORT void FPDF_CALLCONV
-FPDF_SetTypefaceAccessibleFunc(PDFiumEnsureTypefaceCharactersAccessible func);
-#endif // PDFIUM_PRINT_TEXT_WITH_GDI
-
// Experimental API.
// Function: FPDF_SetPrintMode
// Set printing mode when printing on Windows.
