diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-01-11 08:45:31 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-01-11 08:45:31 -0800 |
| commit | 3f1c71f5a6ea058e3eec611c9dcc759b374dcb80 (patch) | |
| tree | b4ef8de26360979381c441cbdfaba94e493b09f6 /fpdfsdk/src/fpdfedit_embeddertest.cpp | |
| parent | c909ce872d999a17ffd44afdc88caf2de43e6cba (diff) | |
| download | pdfium-3f1c71f5a6ea058e3eec611c9dcc759b374dcb80.tar.xz | |
Merge to XFA: Use std::map as CPDF_Dictionary's underlying store.
Replaces CFX_CMapByteStringToPtr. XFA still uses CFX_CMapByteStringToPtr
so it's not completely removed just yet.
Adds begin()/end() to CPDF_Dictionary and removes the
GetStartPos()/GetNextElement() functions to traverse the dictionary.
Callers are changed accordingly. AddValue() is also removed.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1541703003 .
(cherry picked from commit 14f39950451bb9c2a11fbc7173fd47367410f80f)
Review URL: https://codereview.chromium.org/1576033002 .
Diffstat (limited to 'fpdfsdk/src/fpdfedit_embeddertest.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfedit_embeddertest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fpdfsdk/src/fpdfedit_embeddertest.cpp b/fpdfsdk/src/fpdfedit_embeddertest.cpp index 1cd28cff45..480ef51dbd 100644 --- a/fpdfsdk/src/fpdfedit_embeddertest.cpp +++ b/fpdfsdk/src/fpdfedit_embeddertest.cpp @@ -22,20 +22,21 @@ TEST_F(FPDFEditEmbeddertest, EmptyCreation) { "%PDF-1.7\r\n" "%\xA1\xB3\xC5\xD7\r\n" "1 0 obj\r\n" - "<</Type/Catalog/Pages 2 0 R >>\r\n" + "<</Pages 2 0 R /Type/Catalog>>\r\n" "endobj\r\n" "2 0 obj\r\n" - "<</Type/Pages/Count 1/Kids\\[ 4 0 R \\]>>\r\n" + "<</Count 1/Kids\\[ 4 0 R \\]/Type/Pages>>\r\n" "endobj\r\n" "3 0 obj\r\n" "<</CreationDate\\(D:.*\\)/Creator\\(PDFium\\)>>\r\n" "endobj\r\n" "4 0 obj\r\n" - "<</Type/Page/Parent 2 0 R /MediaBox\\[ 0 0 640 " - "480\\]/Rotate 0/Resources<<>>/Contents 5 0 R >>\r\n" + "<</Contents 5 0 R /MediaBox\\[ 0 0 640 480\\]" + "/Parent 2 0 R /Resources<<>>/Rotate 0/Type/Page" + ">>\r\n" "endobj\r\n" "5 0 obj\r\n" - "<</Length 8/Filter/FlateDecode>>stream\r\n" + "<</Filter/FlateDecode/Length 8>>stream\r\n" "x\x9C\x3\0\0\0\0\x1\r\n" "endstream\r\n" "endobj\r\n" |