diff options
| author | caryclark <caryclark@google.com> | 2016-12-06 13:49:34 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-12-06 13:49:34 -0800 |
| commit | 8f875507a986d10335e40a5f7c1679aff9770d0a (patch) | |
| tree | 7e466d2741ea5e36b35422d7aa03326a754afff4 /fpdfsdk | |
| parent | 6bdb56cad7f9e31183b90152324281ac52c4563d (diff) | |
| download | pdfium-8f875507a986d10335e40a5f7c1679aff9770d0a.tar.xz | |
re-enable skia cachingchromium/2944
This permits consecutive path drawing or text drawing to combine
if their graphics state matches. This speeds up rendering considerably
when PDFium draws in many small parts. It also allows discarding
changes to the clip state that have no effect from draw to draw.
All corpus tests draw equivalently with caching enabled or disabled.
Change the member order in CPDF_PageRenderContext so the device is
flushed before the referencing annotation is deleted.
Add more printf style debugging for test draws.
R=dsinclair@chromium.org
Review-Url: https://codereview.chromium.org/2546803003
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfformfill.cpp | 5 | ||||
| -rw-r--r-- | fpdfsdk/fpdfview.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 44204b766a..6b8cbaa59d 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -137,10 +137,11 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, pPageView->PageView_OnDraw(pDevice.get(), &matrix, &options); #endif // PDF_ENABLE_XFA -#ifdef _SKIA_SUPPORT_PATHS + pDevice->RestoreState(false); +#ifdef _SKIA_SUPPORT_PATHS_ + pDevice->Flush(); CFXBitmapFromFPDFBitmap(bitmap)->UnPreMultiply(); #endif - pDevice->RestoreState(false); delete options.m_pOCContext; options.m_pOCContext = nullptr; } diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index f0c269a312..fb87c838d4 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -720,6 +720,7 @@ DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, rotate, flags, true, nullptr); #ifdef _SKIA_SUPPORT_PATHS_ + pDevice->Flush(); pBitmap->UnPreMultiply(); #endif pPage->SetRenderContext(nullptr); |