From 7cbf5e3e03754694157891e290ff30109b8e7583 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 12 Jul 2017 13:10:23 -0400 Subject: SkPDF: simplify drawImage/Bitmap/Sprite code. - SkImageSubset becomes SkKeyedImage - SkPDFCanvas::onDraw{Bitmap, Image} go away - Remove SkPDFCanvas: base classes now do the right thing. - SkPDFDevice::draw{Bitmap,Image}{Rect,}() simplified - 244 fewer SLOC. All but a few PDFs are identical, those rasterize almost the same. Change-Id: I3ceb3b8935c689719cedf1ad544b0407b5c1733e Reviewed-on: https://skia-review.googlesource.com/22218 Commit-Queue: Hal Canary Reviewed-by: Ben Wagner --- gn/pdf.gni | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gn') diff --git a/gn/pdf.gni b/gn/pdf.gni index 6b140e0839..355c27a4a8 100644 --- a/gn/pdf.gni +++ b/gn/pdf.gni @@ -12,12 +12,12 @@ skia_pdf_sources = [ "$_src/pdf/SkDeflate.h", "$_src/pdf/SkJpegInfo.cpp", "$_src/pdf/SkJpegInfo.h", + "$_src/pdf/SkKeyedImage.cpp", + "$_src/pdf/SkKeyedImage.h", "$_src/pdf/SkPDFBitmap.cpp", "$_src/pdf/SkPDFBitmap.h", "$_src/pdf/SkPDFCanon.cpp", "$_src/pdf/SkPDFCanon.h", - "$_src/pdf/SkPDFCanvas.cpp", - "$_src/pdf/SkPDFCanvas.h", "$_src/pdf/SkPDFConvertType1FontStream.cpp", "$_src/pdf/SkPDFConvertType1FontStream.h", "$_src/pdf/SkPDFDevice.cpp", @@ -46,4 +46,5 @@ skia_pdf_sources = [ "$_src/pdf/SkPDFTypes.h", "$_src/pdf/SkPDFUtils.cpp", "$_src/pdf/SkPDFUtils.h", + "$_src/pdf/SkScopeExit.h", ] -- cgit v1.2.3