summaryrefslogtreecommitdiff
path: root/core/fpdfapi/parser
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-21 14:51:57 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-21 19:16:29 +0000
commitb89669975f6156fce4ced5c8998125a845f8e7dc (patch)
tree185c2badc52530ec1baddb854824bc5891e476a1 /core/fpdfapi/parser
parentdb0312e6acd7cc15fef0f64e05bd463cb74c70e4 (diff)
downloadpdfium-b89669975f6156fce4ced5c8998125a845f8e7dc.tar.xz
Move CFX_AutoRestorer to fxcrt::AutoRestorer
This CL renames CFX_AutoRestorer to just AutoRestorer and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: Id9f36df94e95f3b2a55054bc198ca1bfd249ee3d Reviewed-on: https://pdfium-review.googlesource.com/14450 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
index 4412105c7b..4556dc9627 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
@@ -25,7 +25,7 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcrt/cfx_autorestorer.h"
+#include "core/fxcrt/autorestorer.h"
#include "core/fxcrt/cfx_binarybuf.h"
#include "core/fxcrt/fx_extension.h"
#include "third_party/base/numerics/safe_math.h"
@@ -55,7 +55,7 @@ CPDF_SyntaxParser::~CPDF_SyntaxParser() {
}
bool CPDF_SyntaxParser::GetCharAt(FX_FILESIZE pos, uint8_t& ch) {
- CFX_AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
+ AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
m_Pos = pos;
return GetNextChar(ch);
}
@@ -352,7 +352,7 @@ ByteString CPDF_SyntaxParser::GetNextWord(bool* bIsNumber) {
}
ByteString CPDF_SyntaxParser::PeekNextWord(bool* bIsNumber) {
- const CFX_AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
+ AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
return GetNextWord(bIsNumber);
}
@@ -379,7 +379,7 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal(
uint32_t gennum,
bool bDecrypt,
ParseType parse_type) {
- CFX_AutoRestorer<int> restorer(&s_CurrentRecursionDepth);
+ AutoRestorer<int> restorer(&s_CurrentRecursionDepth);
if (++s_CurrentRecursionDepth > kParserMaxRecursionDepth)
return nullptr;
@@ -485,7 +485,7 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectInternal(
// contents to the un-decrypted form.
if (m_pCryptoHandler && bDecrypt && pDict->IsSignatureDict() &&
dwSignValuePos) {
- CFX_AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
+ AutoRestorer<FX_FILESIZE> save_pos(&m_Pos);
m_Pos = dwSignValuePos;
pDict->SetFor("Contents", GetObject(pObjList, objnum, gennum, false));
}