diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-09 17:37:12 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-09 17:37:12 -0800 |
| commit | 99406198ac4921a53425edc73cac67e7b4760895 (patch) | |
| tree | d2f2411dad87d84001202e9a04bb2ed60b725683 /core/src/fpdfapi | |
| parent | 520f247443253356b0ce236066fce95e7fad7680 (diff) | |
| download | pdfium-99406198ac4921a53425edc73cac67e7b4760895.tar.xz | |
Move ScopedSetInsertion to third_party/base/stl_util.h
Also move ScopedFileStream, since it isn't specific to the
parser, and belongs with the fxcrt object it manipulates.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1780063003 .
Diffstat (limited to 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/cpdf_document.cpp | 3 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp index d97d6e01ff..e509e36382 100644 --- a/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -35,7 +35,8 @@ int CountPages(CPDF_Dictionary* pPages, } if (pKid->KeyExist("Kids")) { // Use |visited_pages| to help detect circular references of pages. - ScopedSetInsertion<CPDF_Dictionary*> local_add(visited_pages, pKid); + pdfium::ScopedSetInsertion<CPDF_Dictionary*> local_add(visited_pages, + pKid); count += CountPages(pKid, visited_pages); } else { // This page is a leaf node. diff --git a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp index 675eec8f3a..45d29f9351 100644 --- a/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp @@ -1150,8 +1150,8 @@ CPDF_Object* CPDF_Parser::ParseIndirectObject( // Prevent circular parsing the same object. if (pdfium::ContainsKey(m_ParsingObjNums, objnum)) return nullptr; - ScopedSetInsertion<FX_DWORD> local_insert(&m_ParsingObjNums, objnum); + pdfium::ScopedSetInsertion<FX_DWORD> local_insert(&m_ParsingObjNums, objnum); if (GetObjectType(objnum) == 1 || GetObjectType(objnum) == 255) { FX_FILESIZE pos = m_ObjectInfo[objnum].pos; if (pos <= 0) diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index c8e1ceec0b..49521b0102 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -8,6 +8,7 @@ #include "core/include/fpdfapi/cpdf_parser.h" #include "core/include/fpdfapi/fpdf_parser.h" #include "core/include/fxcrt/fx_stream.h" +#include "core/include/fxcrt/fx_ext.h" #include "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" |