|
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
Committed: https://skia.googlesource.com/skia/+/37c46cad21632cfc1411b08d73af37a1fffe2944
Total comments: 2
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+307 lines, -275 lines) |
Patch |
|
M |
gyp/pdf.gypi
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/doc/SkDocument_PDF.cpp
|
View
|
1
2
|
8 chunks |
+17 lines, -16 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFBitmap.h
|
View
|
1
2
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFBitmap.cpp
|
View
|
1
2
|
6 chunks |
+38 lines, -41 lines |
0 comments
|
Download
|
|
D |
src/pdf/SkPDFCatalog.h
|
View
|
|
1 chunk |
+0 lines, -56 lines |
0 comments
|
Download
|
|
D |
src/pdf/SkPDFCatalog.cpp
|
View
|
|
1 chunk |
+0 lines, -44 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFFont.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFFont.cpp
|
View
|
1
2
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFFontImpl.h
|
View
|
1
2
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFFormXObject.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFFormXObject.cpp
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFGraphicState.h
|
View
|
1
2
|
1 chunk |
+3 lines, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFGraphicState.cpp
|
View
|
1
2
|
1 chunk |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFShader.cpp
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFStream.h
|
View
|
1
2
|
3 chunks |
+4 lines, -6 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFStream.cpp
|
View
|
1
2
|
3 chunks |
+20 lines, -24 lines |
2 comments
|
Download
|
|
M |
src/pdf/SkPDFTypes.h
|
View
|
1
2
|
11 chunks |
+89 lines, -16 lines |
0 comments
|
Download
|
|
M |
src/pdf/SkPDFTypes.cpp
|
View
|
1
2
|
11 chunks |
+87 lines, -30 lines |
0 comments
|
Download
|
|
M |
tests/PDFPrimitivesTest.cpp
|
View
|
1
2
|
10 chunks |
+31 lines, -26 lines |
0 comments
|
Download
|
Total messages: 22 (9 generated)
|