summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-26 21:44:34 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-26 21:44:34 +0000
commitbdf3f682d14df4d51bdded89cc897a27112e4934 (patch)
tree25f0a3b6cd985a3d4a6e20f1001eaa9a2babbeae
parentdc006f9e436339adccc6b5c5bab09b77f518be04 (diff)
downloadpdfium-bdf3f682d14df4d51bdded89cc897a27112e4934.tar.xz
Use UnownedPtr<> in cpdf_streamcontentparserchromium/3474
Change-Id: I558ac625d842d1b3d9dfdaf4d7661d4c02c6244a Reviewed-on: https://pdfium-review.googlesource.com/36133 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
-rw-r--r--core/fpdfapi/page/cpdf_streamcontentparser.cpp4
-rw-r--r--core/fpdfapi/page/cpdf_streamcontentparser.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 8f3e70a278..0a03ed1949 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -61,7 +61,7 @@ const char kPathOperatorRectangle[] = "re";
class CPDF_StreamParserAutoClearer {
public:
- CPDF_StreamParserAutoClearer(CPDF_StreamParser** scoped_variable,
+ CPDF_StreamParserAutoClearer(UnownedPtr<CPDF_StreamParser>* scoped_variable,
CPDF_StreamParser* new_parser)
: scoped_variable_(scoped_variable) {
*scoped_variable_ = new_parser;
@@ -69,7 +69,7 @@ class CPDF_StreamParserAutoClearer {
~CPDF_StreamParserAutoClearer() { *scoped_variable_ = nullptr; }
private:
- CPDF_StreamParser** scoped_variable_;
+ UnownedPtr<CPDF_StreamParser>* scoped_variable_;
};
CFX_FloatRect GetShadingBBox(CPDF_ShadingPattern* pShading,
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h
index a5efe48d46..e972118861 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.h
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.h
@@ -217,7 +217,7 @@ class CPDF_StreamContentParser {
const CFX_FloatRect m_BBox;
uint32_t m_ParamStartPos;
uint32_t m_ParamCount;
- CPDF_StreamParser* m_pSyntax;
+ UnownedPtr<CPDF_StreamParser> m_pSyntax;
std::unique_ptr<CPDF_AllStates> m_pCurStates;
CPDF_ContentMark m_CurContentMark;
std::vector<std::unique_ptr<CPDF_TextObject>> m_ClipTextList;