diff options
| author | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
|---|---|---|
| committer | John Abd-El-Malek <jam@chromium.org> | 2014-12-15 12:13:45 -0800 |
| commit | 207299b5d46e3e0612dd6a0264fb7647177312bb (patch) | |
| tree | 796aeeeab94a2cac2676e3fb359078609c82f809 /core/src/fxge/win32/fx_win32_device.cpp | |
| parent | 0d4fdc1bbf2c23999271617413f89f059d4a71c9 (diff) | |
| download | pdfium-207299b5d46e3e0612dd6a0264fb7647177312bb.tar.xz | |
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
Diffstat (limited to 'core/src/fxge/win32/fx_win32_device.cpp')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index d82102462a..3ee9441bc3 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -391,12 +391,10 @@ FX_BOOL CWin32FontInfo::GetFontCharset(void* hFont, int& charset) charset = tm.tmCharSet; return TRUE; } -#ifndef _FPDFAPI_MINI_ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { return FX_NEW CWin32FontInfo; } -#endif void CFX_GEModule::InitPlatform() { CWin32Platform* pPlatformData = FX_NEW CWin32Platform; @@ -979,11 +977,9 @@ FX_BOOL CGdiDisplayDriver::GetDIBits(CFX_DIBitmap* pBitmap, int left, int top, v ret = FALSE; } } -#ifndef _FPDFAPI_MINI_ if (pBitmap->HasAlpha() && ret) { pBitmap->LoadChannel(FXDIB_Alpha, 0xff); } -#endif DeleteObject(hbmp); DeleteObject(hDCMemory); return ret; @@ -1175,11 +1171,9 @@ IFX_RenderDeviceDriver* CFX_WindowsDevice::CreateDriver(HDC hDC, FX_BOOL bCmykOu } else { device_class = FXDC_DISPLAY; } -#ifndef _FPDFAPI_MINI_ if (device_class == FXDC_PRINTER) { return FX_NEW CGdiPrinterDriver(hDC); } -#endif return FX_NEW CGdiDisplayDriver(hDC); } CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width, int height, FXDIB_Format format) |