From d6e18875ce024a341e221db689cedf10d433be8d Mon Sep 17 00:00:00 2001 From: caryclark Date: Fri, 13 May 2016 10:57:20 -0700 Subject: allow Skia to be the default graphics engine PDFium uses fxge to denote the graphics engine used for general rendering. When pdf_use_skia=1 is set, use Skia as the default engine instead of antigrain. R=tsepez@chromium.org,dsinclair@chromium.org Review-Url: https://codereview.chromium.org/1975143002 --- fpdfsdk/fpdfview.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'fpdfsdk/fpdfview.cpp') diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 405d8dc749..020ff8df6d 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -549,13 +549,8 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, pBitmap = new CFX_DIBitmap; pBitmap->Create(size_x, size_y, FXDIB_Argb); pBitmap->Clear(0x00ffffff); -#ifdef _SKIA_SUPPORT_ - pContext->m_pDevice = new CFX_SkiaDevice; - ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap); -#else pContext->m_pDevice = new CFX_FxgeDevice; ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)pBitmap); -#endif } else { pContext->m_pDevice = new CFX_WindowsDevice(dc); } @@ -648,15 +643,6 @@ DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, return; CRenderContext* pContext = new CRenderContext; pPage->SetPrivateData((void*)1, pContext, DropContext); -#ifdef _SKIA_SUPPORT_ - pContext->m_pDevice = new CFX_SkiaDevice(); - - if (flags & FPDF_REVERSE_BYTE_ORDER) - ((CFX_SkiaDevice*)pContext->m_pDevice) - ->Attach((CFX_DIBitmap*)bitmap, 0, TRUE); - else - ((CFX_SkiaDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap); -#else pContext->m_pDevice = new CFX_FxgeDevice; if (flags & FPDF_REVERSE_BYTE_ORDER) @@ -664,7 +650,6 @@ DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, ->Attach((CFX_DIBitmap*)bitmap, 0, TRUE); else ((CFX_FxgeDevice*)pContext->m_pDevice)->Attach((CFX_DIBitmap*)bitmap); -#endif FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y, rotate, flags, TRUE, NULL); @@ -682,7 +667,7 @@ DLLEXPORT FPDF_RECORDER STDCALL FPDF_RenderPageSkp(FPDF_PAGE page, return nullptr; std::unique_ptr pContext(new CRenderContext); pPage->SetPrivateData((void*)1, pContext.get(), DropContext); - CFX_SkiaDevice* skDevice = new CFX_SkiaDevice(); + CFX_FxgeDevice* skDevice = new CFX_FxgeDevice; FPDF_RECORDER recorder = skDevice->CreateRecorder(size_x, size_y); pContext->m_pDevice = skDevice; @@ -835,11 +820,7 @@ DLLEXPORT void STDCALL FPDFBitmap_FillRect(FPDF_BITMAP bitmap, FPDF_DWORD color) { if (!bitmap) return; -#ifdef _SKIA_SUPPORT_ - CFX_SkiaDevice device; -#else CFX_FxgeDevice device; -#endif device.Attach((CFX_DIBitmap*)bitmap); if (!((CFX_DIBitmap*)bitmap)->HasAlpha()) color |= 0xFF000000; -- cgit v1.2.3