| Index: fpdfsdk/fpdfview.cpp
|
| diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
|
| index 405d8dc749e11e11cd0d927142637922112cd868..020ff8df6d57c8bc39d52c914b7d1754013b0cca 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<CRenderContext> 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;
|
|
|