diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-17 13:57:46 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-17 13:57:46 -0700 |
| commit | 48606843d54c5f870d69627afedd574b58d65b3e (patch) | |
| tree | b8c8fe92e99f2deea542611dfb21e94a2c06541d /fpdfsdk/src/fpdfformfill.cpp | |
| parent | 916228365f7f03a51e5fb0e4bab03fa708b107c5 (diff) | |
| download | pdfium-48606843d54c5f870d69627afedd574b58d65b3e.tar.xz | |
Replace FX_NEW with new, remove tests from fpdfsdk
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1089823004
Diffstat (limited to 'fpdfsdk/src/fpdfformfill.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfformfill.cpp | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index fc84d28dc9..0f94733347 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -206,13 +206,10 @@ DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, FPDF_BITMAP bitmap, options.m_ForeColor = 0; options.m_BackColor = 0xffffff; } - - options.m_AddFlags = flags >> 8; - options.m_pOCContext = FX_NEW CPDF_OCContext(pPage->m_pDocument); + options.m_AddFlags = flags >> 8; + options.m_pOCContext = new CPDF_OCContext(pPage->m_pDocument); - //FXMT_CSLOCK_OBJ(&pPage->m_PageLock); - CFX_AffineMatrix matrix; pPage->GetDisplayMatrix(matrix, start_x, start_y, size_x, size_y, rotate); @@ -223,30 +220,15 @@ DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, FPDF_BITMAP bitmap, clip.bottom = start_y + size_y; #ifdef _SKIA_SUPPORT_ - CFX_SkiaDevice* pDevice = FX_NEW CFX_SkiaDevice; + CFX_SkiaDevice* pDevice = new CFX_SkiaDevice; #else - CFX_FxgeDevice* pDevice = NULL; - pDevice = FX_NEW CFX_FxgeDevice; + CFX_FxgeDevice* pDevice = new CFX_FxgeDevice; #endif - - if (!pDevice) - return; pDevice->Attach((CFX_DIBitmap*)bitmap); pDevice->SaveState(); pDevice->SetClip_Rect(&clip); - - - CPDF_RenderContext* pContext = NULL; - pContext = FX_NEW CPDF_RenderContext; - if (!pContext) - { - delete pDevice; - pDevice = NULL; - return; - } - -// CPDF_Document* pDoc = pPage->m_pDocument; + CPDF_RenderContext* pContext = new CPDF_RenderContext; CPDFDoc_Environment* pEnv = (CPDFDoc_Environment*)hHandle; CPDFSDK_Document* pFXDoc = pEnv->GetCurrentDoc(); if(!pFXDoc) |