diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 09:09:10 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-08 09:09:10 +0000 |
| commit | b58772f86659cfe0e8d9247fcee878dddd8fdad9 (patch) | |
| tree | 78c54090d70af79ab206ef5137833c0703874203 /src/pipe | |
| parent | 754a3eb73b796398062f09cc98eae224262a3bc8 (diff) | |
PDF: add support for named destinations.
Landing patchset 7 from https://codereview.appspot.com/7374052 for dml@google.com
Review URL: https://codereview.chromium.org/12533009
git-svn-id: http://skia.googlecode.com/svn/trunk@8034 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkGPipePriv.h | 3 | ||||
| -rw-r--r-- | src/pipe/SkGPipeRead.cpp | 3 | ||||
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/pipe/SkGPipePriv.h b/src/pipe/SkGPipePriv.h index b563652cb9..f5f98f2bdf 100644 --- a/src/pipe/SkGPipePriv.h +++ b/src/pipe/SkGPipePriv.h @@ -25,8 +25,9 @@ enum PaintFlats { kShader_PaintFlat, kImageFilter_PaintFlat, kXfermode_PaintFlat, + kAnnotation_PaintFlat, - kLast_PaintFlat = kXfermode_PaintFlat + kLast_PaintFlat = kAnnotation_PaintFlat }; #define kCount_PaintFlats (kLast_PaintFlat + 1) diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp index 6cffb1b343..f47f3bfe65 100644 --- a/src/pipe/SkGPipeRead.cpp +++ b/src/pipe/SkGPipeRead.cpp @@ -53,6 +53,9 @@ static void set_paintflat(SkPaint* paint, SkFlattenable* obj, unsigned paintFlat case kXfermode_PaintFlat: paint->setXfermode((SkXfermode*)obj); break; + case kAnnotation_PaintFlat: + paint->setAnnotation((SkAnnotation*)obj); + break; default: SkDEBUGFAIL("never gets here"); } diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index cfd1e7ceef..34020dfe7f 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -6,6 +6,7 @@ * found in the LICENSE file. */ +#include "SkAnnotation.h" #include "SkBitmapHeap.h" #include "SkCanvas.h" #include "SkColorFilter.h" @@ -47,6 +48,7 @@ static SkFlattenable* get_paintflat(const SkPaint& paint, unsigned paintFlat) { case kShader_PaintFlat: return paint.getShader(); case kImageFilter_PaintFlat: return paint.getImageFilter(); case kXfermode_PaintFlat: return paint.getXfermode(); + case kAnnotation_PaintFlat: return paint.getAnnotation(); } SkDEBUGFAIL("never gets here"); return NULL; |