diff options
| author |  Hal Canary <halcanary@google.com> | 2017-07-12 13:10:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-12 20:41:41 +0000 |
| commit | 7cbf5e3e03754694157891e290ff30109b8e7583 (patch) | |
| tree | 8ad4ad88c04a5ddbd920f3d8a2ee4478de2a7fcf /src/pdf/SkPDFDevice.h | |
| parent | 5769dd2c9ad9443b8cf2d62748d5747e547c7ad5 (diff) | |
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 <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/pdf/SkPDFDevice.h')
| -rw-r--r-- | src/pdf/SkPDFDevice.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h index 8d2c511be0..6df9d6dba2 100644 --- a/src/pdf/SkPDFDevice.h +++ b/src/pdf/SkPDFDevice.h @@ -20,8 +20,9 @@ #include "SkStream.h" #include "SkTDArray.h" #include "SkTextBlob.h" +#include "SkKeyedImage.h" -class SkImageSubset; +class SkKeyedImage; class SkPath; class SkPDFArray; class SkPDFCanon; @@ -246,10 +247,11 @@ private: void internalDrawPaint(const SkPaint& paint, ContentEntry* contentEntry); - void internalDrawImage(const SkMatrix& origMatrix, - const SkClipStack& clipStack, - SkImageSubset imageSubset, - const SkPaint& paint); + void internalDrawImageRect(SkKeyedImage, + const SkRect* src, + const SkRect& dst, + const SkPaint&, + const SkMatrix& canvasTransformationMatrix); void internalDrawPath(const SkClipStack&, const SkMatrix&, |