diff options
| author |  halcanary <halcanary@google.com> | 2015-03-31 12:30:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-31 12:30:20 -0700 |
| commit | 37c46cad21632cfc1411b08d73af37a1fffe2944 (patch) | |
| tree | 9184735eca86ec7110cd970be674d19d4812e1f6 /src/pdf/SkPDFGraphicState.h | |
| parent | e0f812a7a107986dfa72e6855c1608b077428136 (diff) | |
SkPDF: Factor SkPDFCatalog into SkPDFObjNumMap and SkPDFSubstituteMap
Motivation: Keep separate features separate. Also, future
linearization work will need to have several objNumMap
objects share a substituteMap. Also "catalog" has a
specific meaning in PDF. This catalog did not map to that
catalog.
- Modify SkPDFObject::emitObject and SkPDFObject::addResources
interface to requiore SkPDFObjNumMap and SkPDFSubstituteMap.
- SkPDFObjNumMap const in SkPDFObject::emitObject.
- Remove SkPDFCatalog.cpp/.h
- Modify SkDocument_PDF.cpp to use new functions
- Fold in SkPDFStream::populate
- Fold in SkPDFBitmap::emitDict
- Move SkPDFObjNumMap and SkPDFSubstituteMap to SkPDFTypes.h
- Note (via assert) that SkPDFArray & SkPDFDict don't need to
check substitutes.
- Remove extra space from SkPDFDict serialization.
- SkPDFBitmap SkPDFType0Font SkPDFGraphicState SkPDFStream
updated to new interface.
- PDFPrimitivesTest updated for new interface.
BUG=skia:3585
Review URL: https://codereview.chromium.org/1049753002
Diffstat (limited to 'src/pdf/SkPDFGraphicState.h')
| -rw-r--r-- | src/pdf/SkPDFGraphicState.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h index dc41fc6229..85a324b191 100644 --- a/src/pdf/SkPDFGraphicState.h +++ b/src/pdf/SkPDFGraphicState.h @@ -37,7 +37,9 @@ public: // Override emitObject so that we can populate the dictionary on // demand. - virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog); + virtual void emitObject(SkWStream* stream, + const SkPDFObjNumMap& objNumMap, + const SkPDFSubstituteMap& substitutes); /** Get the graphic state for the passed SkPaint. The reference count of * the object is incremented and it is the caller's responsibility to |