summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-09-14 21:56:59 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-09-14 21:56:59 +0000
commitc6ab97b5b5be7083c4929b7f08b33203a7f932da (patch)
treef7d7baca1425d1a2928abd490ffdd9cf19075d2b /core
parent5091a49b4a0549375a196a6f8c539f25ff48c3e7 (diff)
downloadpdfium-c6ab97b5b5be7083c4929b7f08b33203a7f932da.tar.xz
Use UnownedPtr in CFX_UnicodeEncoding.
Change-Id: I410909be359a5b5bb0c90d42064144771183525e Reviewed-on: https://pdfium-review.googlesource.com/42461 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/parser/cpdf_document.cpp2
-rw-r--r--core/fxge/cfx_unicodeencoding.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index 7119e7649a..233b98e3af 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -188,6 +188,8 @@ CPDF_Document::CPDF_Document()
m_pDocRender(pdfium::MakeUnique<CPDF_DocRenderData>(this)) {}
CPDF_Document::~CPDF_Document() {
+ // Destroy the extension before doing any non-extension teardown.
+ m_pExtension.reset();
CPDF_ModuleMgr::Get()->GetPageModule()->ClearStockFont(this);
}
diff --git a/core/fxge/cfx_unicodeencoding.h b/core/fxge/cfx_unicodeencoding.h
index f8bcff391f..57848c1267 100644
--- a/core/fxge/cfx_unicodeencoding.h
+++ b/core/fxge/cfx_unicodeencoding.h
@@ -9,6 +9,8 @@
#include <stdint.h>
+#include "core/fxcrt/unowned_ptr.h"
+
#ifdef PDF_ENABLE_XFA
#define FXFM_ENC_TAG(a, b, c, d) \
(((uint32_t)(a) << 24) | ((uint32_t)(b) << 16) | ((uint32_t)(c) << 8) | \
@@ -39,7 +41,7 @@ class CFX_UnicodeEncoding {
virtual uint32_t GlyphFromCharCode(uint32_t charcode);
protected:
- CFX_Font* m_pFont; // Unowned, not nullptr.
+ UnownedPtr<CFX_Font> const m_pFont;
};
#endif // CORE_FXGE_CFX_UNICODEENCODING_H_